From: Andre Heider Date: Tue, 29 Sep 2020 12:34:26 +0000 (+0200) Subject: arm: mvebu: Espressobin: Fix checks against machine compatible strings X-Git-Url: http://git.dujemihanovic.xyz/login.html?a=commitdiff_plain;h=05e7511fae612aabfc13c58da9bafa12b6438ec8;p=u-boot.git 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 Signed-off-by: Andre Heider Reviewed-by: Pali Rohár --- diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c index eacee15cb3..2bfc7171c4 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");