From 15ad9fc5aa1df634fa7da2dc06980d32f1bbef6e Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Fri, 5 Nov 2021 12:21:46 +0000 Subject: 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 Signed-off-by: Ian Abbott Link: https://lore.barebox.org/20211105122146.29370-3-abbotti@mev.co.uk Signed-off-by: Sascha Hauer --- arch/arm/dts/socfpga_cyclone5_sockit.dts | 3 --- 1 file changed, 3 deletions(-) (limited to 'arch/arm/dts') 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; -- cgit v1.2.3