mvebu_armada-37xx: Wrong usage of of_machine_is_compatible in u-boot master
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"
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?
Hi Pali,
Quoted 7 lines · Pali Roh?r
Hello!
In current U-Boot master branch is
board_late_init()function formvebu_armada-37xx/board.cslightly 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
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
Quoted 25 lines
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#L303In 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#L54So "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.cfile would not be broken?
Hi Andre,
Hi Pali,
Quoted 8 lines · Andre Heider
Hi Pali,
Quoted 5 lines · Pali Roh?r
Hello!
In current U-Boot master branch is
board_late_init()function formvebu_armada-37xx/board.cslightly broken.
Quoted 8 lines
Quoted 2 lines
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=199579Stefan,
did that set fall through the cracks or is that for -next?
It's for next.
Quoted 3 lines
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?
Please send a fix for current master now. That would be helpful.
Thanks,
Stefan
Quoted 35 lines
Thanks,
AndreQuoted 31 lines
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.cfile would not be broken?
Viele Gr??e,
Stefan
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
Quoted 5 lines · On Tuesday 29 September 2020 14:17:46 Andre Heider wrote:
Hi Pali,
Quoted 2 lines · Pali Roh?r
Hello!
Quoted 8 lines
Quoted 5 lines
In current U-Boot master branch is
board_late_init()function formvebu_armada-37xx/board.cslightly 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.
Quoted 35 lines
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,
AndreQuoted 25 lines
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#L303In 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#L54So "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.cfile would not be broken?
Quoted 19 lines · Pali Roh?r
Quoted 5 lines · On Tuesday 29 September 2020 14:17:46 Andre Heider wrote:
Hi Pali,
Quoted 2 lines · Pali Roh?r
Hello!
Quoted 8 lines
Quoted 5 lines
In current U-Boot master branch is
board_late_init()function formvebu_armada-37xx/board.cslightly 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=199579Now 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.cfile updating...
Quoted 6 lines
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.cand let synchronization of armada-3720 DTS files with kernel after U-Boot 2020.10 release.
Full ack.
Thanks,
Stefan
Quoted 27 lines
Quoted 27 lines
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,
AndreQuoted 18 lines
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#L303In 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#L54So "globalscale,espressobin" would not work.
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
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.cfile would not be broken?
Viele Gr??e,
Stefan
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
Quoted 12 lines · Pali Roh?r
Quoted 11 lines · On Tuesday 29 September 2020 14:17:46 Andre Heider wrote:
Hi Pali,
Quoted 7 lines · Pali Roh?r
Hello!
In current U-Boot master branch is
board_late_init()function formvebu_armada-37xx/board.cslightly broken.There are two
of_machine_is_compatible()checks for non-existent compatible string "globalscale,espressobin"
Quoted 6 lines
Quoted 2 lines
thanks for spotting that! It's because I based the patch on another set:
https://patchwork.ozlabs.org/project/uboot/list/?series=199579Now 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.cfile updating...
It doesn't change that compatible because Marvell is indeed the vendor of those development boards ;) You'll find that one in the Linux tree as well.
My patch just changes the Espressobin ones, since Globalscale is the actual vendor (but I don't know why Linux settled "Globalscale Marvell").
Quoted 7 lines
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.cand let synchronization of armada-3720 DTS files with kernel after U-Boot 2020.10 release.
Done and sent.
Thanks,
Andre
Quoted 36 lines
Quoted 36 lines
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,
AndreQuoted 25 lines
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#L303In 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#L54So "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.cfile would not be broken?