diff options
| author | Ian Abbott <abbotti@mev.co.uk> | 2021-11-05 12:21:46 +0000 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-11-08 09:11:06 +0100 |
| commit | 15ad9fc5aa1df634fa7da2dc06980d32f1bbef6e (patch) | |
| tree | c1d9b31738f65f4bdbb1ff83f8ce5654610bfdf0 /arch/arm | |
| parent | ba723fc40e63274bf90144cd31b599f4159ca049 (diff) | |
| download | barebox-15ad9fc5aa1df634fa7da2dc06980d32f1bbef6e.tar.gz barebox-15ad9fc5aa1df634fa7da2dc06980d32f1bbef6e.tar.xz | |
ARM: Terasic SoCkit: Use upstream compatible string
The upstream (Linux) 'compatible' string for the Terasic SoCkit board in
"dts/src/arm/socfpga_cyclone5_sockit.dts" differs from the barebox
'compatible' string for the same board in
"arch/arm/dts/socfpga_cyclone5_sockit.dts":
Linux: "terasic,socfpga-cyclone5-sockit"
barebox: "terasic,sockit"
That results in an incompatibility when trying to boot a bootloader spec
entry with a 'devicetree' key that refers to the DTB file built from the
Linux sources. The barebox bootloader spec loader will ignore the entry
because the 'compatible' string in the root node of the DTB does not
match what barebox expects.
Remove the 'compatible' string list from
"arch/arm/dts/socfpga_cyclone5_sockit.dts" so that barebox uses the
upstream compatible string list. Also remove the 'model' string
("Terasic SoCkit") which is identical to the upstream 'model' string.
Finally, update the `of_machine_is_compatible("terasic,sockit")`
function call in `socfpga_console_init()` to use the
"terasic,socfpga-cyclone5-sockit" string.
Cc: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Link: https://lore.barebox.org/20211105122146.29370-3-abbotti@mev.co.uk
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boards/terasic-sockit/board.c | 2 | ||||
| -rw-r--r-- | arch/arm/dts/socfpga_cyclone5_sockit.dts | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/boards/terasic-sockit/board.c b/arch/arm/boards/terasic-sockit/board.c index ec68315998..19e67ff933 100644 --- a/arch/arm/boards/terasic-sockit/board.c +++ b/arch/arm/boards/terasic-sockit/board.c @@ -25,7 +25,7 @@ static int phy_fixup(struct phy_device *dev) static int socfpga_console_init(void) { - if (!of_machine_is_compatible("terasic,sockit")) + if (!of_machine_is_compatible("terasic,socfpga-cyclone5-sockit")) return 0; if (IS_ENABLED(CONFIG_PHYLIB)) diff --git a/arch/arm/dts/socfpga_cyclone5_sockit.dts b/arch/arm/dts/socfpga_cyclone5_sockit.dts index 23e07c964c..27d2087a33 100644 --- a/arch/arm/dts/socfpga_cyclone5_sockit.dts +++ b/arch/arm/dts/socfpga_cyclone5_sockit.dts @@ -19,9 +19,6 @@ #include "socfpga.dtsi" / { - model = "Terasic SoCkit"; - compatible = "terasic,sockit", "altr,socfpga"; - chosen { stdout-path = &uart0; |