From: Pali =?utf-8?B?Um9ow6Fy?= Date: Tue, 29 Sep 2020 14:41:16 +0200 Subject: [PATCH] arm: mvebu: Espressobin: Fix checks against machine compatible strings In-Reply-To: <20200929123839.p5mkxeet7vn5zfud@pali> References: <20200929123426.15346-1-a.heider@gmail.com> <20200929123839.p5mkxeet7vn5zfud@pali> Message-ID: <20200929124116.6h5qlftc2n7ai2xp@pali> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Tuesday 29 September 2020 14:38:39 Pali Roh?r wrote: > On Tuesday 29 September 2020 14:34:26 Andre Heider wrote: > > 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 > > --- > > board/Marvell/mvebu_armada-37xx/board.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > 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"); > > I run 'git grep marvell,armada-3720-espressobin-emmc origin/master' just > for verification... but it returned me empty result. > > So marvell,armada-3720-espressobin-emmc is not correct too and therefore > this patch does not still fix this problem. Ok, now I see where is the problem. eMMC support for Espressobin is not in U-Boot master yet. So for U-Boot master the best would be to revert/remove this emmc chunk of code. > > > > if (ddr4 && emmc) > > env_set("fdtfile", "marvell/armada-3720-espressobin-v7-emmc.dtb"); > > -- > > 2.28.0 > >