LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm: mvebu: Espressobin: Fix checks against machine compatible strings 

The patches changing the compatible strings to the ones used by Linux have
not been merged yet, so fix the checks to use the current in-tree ones.

Reported-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Andre Heider <a.heider@gmail.com>
Reviewed-by: Pali Rohár <pali@kernel.org>
This commit is contained in:
Andre Heider 2020-09-29 14:34:26 +02:00 committed by Stefan Roese
parent 3dee18e2c2
commit 05e7511fae
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
board/Marvell/mvebu_armada-37xx/board.c
View File

@ -88,14 +88,14 @@ int board_late_init(void)
if (env_get("fdtfile")) if (env_get("fdtfile"))
return 0; return 0;
if (!of_machine_is_compatible("globalscale,espressobin")) if (!of_machine_is_compatible("marvell,armada-3720-espressobin"))
return 0; return 0;
/* If the memory controller has been configured for DDR4, we're running on v7 */ /* 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) 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; & 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) if (ddr4 && emmc)
env_set("fdtfile", "marvell/armada-3720-espressobin-v7-emmc.dtb"); env_set("fdtfile", "marvell/armada-3720-espressobin-v7-emmc.dtb");