This gets rid of the (mostly) stub top level DTs in barebox and switches the compatible to the proper "boundary" one. Signed-off-by: Lucas Stach <l.stach@xxxxxxxxxxxxxx> --- arch/arm/boards/boundarydevices-nitrogen6x/board.c | 8 ++++---- arch/arm/dts/imx6dl-nitrogen6x.dts | 8 +------- arch/arm/dts/imx6q-nitrogen6x.dts | 12 +----------- arch/arm/dts/imx6qdl-nitrogen6x.dtsi | 2 -- 4 files changed, 6 insertions(+), 24 deletions(-) diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/board.c b/arch/arm/boards/boundarydevices-nitrogen6x/board.c index 347fd9128bcd..28dba3af9a15 100644 --- a/arch/arm/boards/boundarydevices-nitrogen6x/board.c +++ b/arch/arm/boards/boundarydevices-nitrogen6x/board.c @@ -22,8 +22,8 @@ static int nitrogen6x_devices_init(void) { - if (!of_machine_is_compatible("fsl,imx6dl-nitrogen6x") && - !of_machine_is_compatible("fsl,imx6q-nitrogen6x")) + if (!of_machine_is_compatible("boundary,imx6dl-nitrogen6x") && + !of_machine_is_compatible("boundary,imx6q-nitrogen6x")) return 0; imx6_bbu_internal_spi_i2c_register_handler("spiflash", "/dev/m25p0.barebox", @@ -54,8 +54,8 @@ static int ksz9021rn_phy_fixup(struct phy_device *dev) static int nitrogen6x_coredevices_init(void) { - if (!of_machine_is_compatible("fsl,imx6dl-nitrogen6x") && - !of_machine_is_compatible("fsl,imx6q-nitrogen6x")) + if (!of_machine_is_compatible("boundary,imx6dl-nitrogen6x") && + !of_machine_is_compatible("boundary,imx6q-nitrogen6x")) return 0; phy_register_fixup_for_uid(PHY_ID_KSZ9021, MICREL_PHY_ID_MASK, diff --git a/arch/arm/dts/imx6dl-nitrogen6x.dts b/arch/arm/dts/imx6dl-nitrogen6x.dts index 50267b103866..bc199c31671d 100644 --- a/arch/arm/dts/imx6dl-nitrogen6x.dts +++ b/arch/arm/dts/imx6dl-nitrogen6x.dts @@ -11,12 +11,6 @@ * http://www.gnu.org/copyleft/gpl.html */ -/dts-v1/; -#include <arm/imx6dl.dtsi> +#include <arm/imx6dl-nitrogen6x.dts> #include "imx6dl.dtsi" #include "imx6qdl-nitrogen6x.dtsi" - -/ { - model = "Freescale i.MX6 DualLite Nitrogen6x Board"; - compatible = "fsl,imx6dl-nitrogen6x", "fsl,imx6dl"; -}; diff --git a/arch/arm/dts/imx6q-nitrogen6x.dts b/arch/arm/dts/imx6q-nitrogen6x.dts index d8906e606381..e4a6a6c29e97 100644 --- a/arch/arm/dts/imx6q-nitrogen6x.dts +++ b/arch/arm/dts/imx6q-nitrogen6x.dts @@ -11,16 +11,6 @@ * http://www.gnu.org/copyleft/gpl.html */ -/dts-v1/; -#include <arm/imx6q.dtsi> +#include <arm/imx6q-nitrogen6x.dts> #include "imx6q.dtsi" #include "imx6qdl-nitrogen6x.dtsi" - -/ { - model = "Freescale i.MX6 Quad Nitrogen6x Board"; - compatible = "fsl,imx6q-nitrogen6x", "fsl,imx6q"; -}; - -&sata { - status = "okay"; -}; diff --git a/arch/arm/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/dts/imx6qdl-nitrogen6x.dtsi index 9ff7395f45e7..76e55e057cce 100644 --- a/arch/arm/dts/imx6qdl-nitrogen6x.dtsi +++ b/arch/arm/dts/imx6qdl-nitrogen6x.dtsi @@ -16,8 +16,6 @@ / { chosen { - linux,stdout-path = &uart2; - environment@0 { compatible = "barebox,environment"; device-path = &flash, "partname:barebox-environment"; -- 2.8.1 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox