Align with the mainline device tree, include it, and remove all unchanged nodes and properties.
Signed-off-by: Philipp Zabel <[email protected]> --- arch/arm/dts/imx6q-phytec-pbab01.dts | 4 ---- arch/arm/dts/imx6qdl-phytec-pbab01.dtsi | 16 +--------------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/arch/arm/dts/imx6q-phytec-pbab01.dts b/arch/arm/dts/imx6q-phytec-pbab01.dts index 580338d..2f816dd 100644 --- a/arch/arm/dts/imx6q-phytec-pbab01.dts +++ b/arch/arm/dts/imx6q-phytec-pbab01.dts @@ -16,8 +16,4 @@ / { model = "Phytec phyFLEX-i.MX6 Quad Carrier-Board"; compatible = "phytec,imx6x-pbab01", "phytec,imx6q-pfla02", "fsl,imx6q"; - - chosen { - linux,stdout-path = &uart4; - }; }; diff --git a/arch/arm/dts/imx6qdl-phytec-pbab01.dtsi b/arch/arm/dts/imx6qdl-phytec-pbab01.dtsi index 157e130..86ab991 100644 --- a/arch/arm/dts/imx6qdl-phytec-pbab01.dtsi +++ b/arch/arm/dts/imx6qdl-phytec-pbab01.dtsi @@ -9,22 +9,8 @@ * http://www.gnu.org/copyleft/gpl.html */ -&fec { - status = "okay"; -}; +#include <arm/imx6qdl-phytec-pbab01.dtsi> &uart1 { status = "okay"; }; - -&uart4 { - status = "okay"; -}; - -&usdhc2 { - status = "okay"; -}; - -&usdhc3 { - status = "okay"; -}; -- 2.4.6 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
