diff options
| author | Tom Rini <trini@konsulko.com> | 2020-10-01 08:55:20 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-10-01 08:55:20 -0400 |
| commit | 4f48163201f991de6d4a31b1c98a79e19971f57f (patch) | |
| tree | f7596d1fa743008419ffdcdc136276f48bc134eb /board | |
| parent | 47e180fa63a9e1eb441782920b2bf0202634f0d8 (diff) | |
| parent | 05e7511fae612aabfc13c58da9bafa12b6438ec8 (diff) | |
| download | u-boot-4f48163201f991de6d4a31b1c98a79e19971f57f.zip u-boot-4f48163201f991de6d4a31b1c98a79e19971f57f.tar.gz u-boot-4f48163201f991de6d4a31b1c98a79e19971f57f.tar.bz2 | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
- Espressobin: Fix compatible string check
- Espressobin: Extend README for more MAC addresses
Diffstat (limited to 'board')
| -rw-r--r-- | board/Marvell/mvebu_armada-37xx/board.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c index eacee15..2bfc717 100644 --- a/board/Marvell/mvebu_armada-37xx/board.c +++ b/board/Marvell/mvebu_armada-37xx/board.c @@ -88,14 +88,14 @@ int board_late_init(void) if (env_get("fdtfile")) return 0; - if (!of_machine_is_compatible("globalscale,espressobin")) + if (!of_machine_is_compatible("marvell,armada-3720-espressobin")) return 0; /* If the memory controller has been configured for DDR4, we're running on v7 */ ddr4 = ((readl(A3700_CH0_MC_CTRL2_REG) >> A3700_MC_CTRL2_SDRAM_TYPE_OFFS) & A3700_MC_CTRL2_SDRAM_TYPE_MASK) == A3700_MC_CTRL2_SDRAM_TYPE_DDR4; - emmc = of_machine_is_compatible("globalscale,espressobin-emmc"); + emmc = of_machine_is_compatible("marvell,armada-3720-espressobin-emmc"); if (ddr4 && emmc) env_set("fdtfile", "marvell/armada-3720-espressobin-v7-emmc.dtb"); |