mvebu_armada-37xx: Wrong usage of of_machine_is_compatible in u-boot master

[Pali Rohár]

On Tuesday 29 September 2020 14:17:46 Andre Heider wrote:
> Hi Pali,
> 
> On 29/09/2020 11:52, Pali Rohár wrote:
> > Hello!
> > 
> > In current U-Boot master branch is board_late_init() function for
> > mvebu_armada-37xx/board.c slightly broken.
> > 
> > There are two of_machine_is_compatible() checks for non-existent
> > compatible string "globalscale,espressobin"
> 
> thanks for spotting that! It's because I based the patch on another set:
> https://patchwork.ozlabs.org/project/uboot/list/?series=199579

Now I see that above patch was not merged. But I also see that it does
not change/update "marvell,armada-3720-db" compatible string, so I think
it is not complete for mvebe_armada-37xx/board.c file updating...

So now before 2020.10 release it would be faster and more safe to do

$ sed 's/"globalscale,espressobin"/"marvell,armada-3720-espressobin"/g' -i board/Marvell/mvebu_armada-37xx/board.c

and let synchronization of armada-3720 DTS files with kernel after
U-Boot 2020.10 release.

> Stefan,
> did that set fall through the cracks or is that for -next?
> 
> Do you want me to send a patch to fix the compatible strings for the in-tree
> vendor string, or do you want to take (at least) patch #1 of that set?
> 
> Thanks,
> Andre
> 
> > 
> > https://gitlab.denx.de/u-boot/u-boot/-/blob/master/board/Marvell/mvebu_armada-37xx/board.c#L91
> > 
> > On all other places is correct compatible "marvell,armada-3720-db" or
> > "marvell,armada-3720-espressobin":
> > 
> > https://gitlab.denx.de/u-boot/u-boot/-/blob/master/board/Marvell/mvebu_armada-37xx/board.c#L121
> > https://gitlab.denx.de/u-boot/u-boot/-/blob/master/board/Marvell/mvebu_armada-37xx/board.c#L159
> > https://gitlab.denx.de/u-boot/u-boot/-/blob/master/board/Marvell/mvebu_armada-37xx/board.c#L303
> > 
> > In DTS files in U-Boot master branch is really "marvell,armada-3720-db"
> > and "marvell,armada-3720-espressobin":
> > 
> > https://gitlab.denx.de/u-boot/u-boot/-/blob/master/arch/arm/dts/armada-3720-db.dts#L53
> > https://gitlab.denx.de/u-boot/u-boot/-/blob/master/arch/arm/dts/armada-3720-espressobin.dts#L54
> > 
> > So "globalscale,espressobin" would not work.
> > 
> > I think that "globalscale,espressobin" in board.c#L91 should be fixed,
> > changed to "marvell,armada-3720-espressobin" to not have broken
> > mvebu_armada-37xx code in 2020.10 U-Boot release.
> > 
> > Stefan, can you do this fix for 2020.10 release, so
> > mvebu_armada-37xx/board.c file would not be broken?
> > 
>