diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2016-07-22 14:31:26 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-08-03 07:30:41 +0200 |
| commit | 470c90aa21c2aa158d4b52c1c1c77781b1ad9706 (patch) | |
| tree | fb4d59cccc258da5cd365f7c8840ff2899093565 /arch/arm/dts | |
| parent | 4154abe2719e8608528f1ba1186bc74c79db36b9 (diff) | |
| download | barebox-470c90aa21c2aa158d4b52c1c1c77781b1ad9706.tar.gz barebox-470c90aa21c2aa158d4b52c1c1c77781b1ad9706.tar.xz | |
ARM: nitrogen6x: use upstream DTs
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@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/dts')
| -rw-r--r-- | arch/arm/dts/imx6dl-nitrogen6x.dts | 8 | ||||
| -rw-r--r-- | arch/arm/dts/imx6q-nitrogen6x.dts | 12 | ||||
| -rw-r--r-- | arch/arm/dts/imx6qdl-nitrogen6x.dtsi | 2 |
3 files changed, 2 insertions, 20 deletions
diff --git a/arch/arm/dts/imx6dl-nitrogen6x.dts b/arch/arm/dts/imx6dl-nitrogen6x.dts index 50267b1038..bc199c3167 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 d8906e6063..e4a6a6c29e 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 9ff7395f45..76e55e057c 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"; |