summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorWenbin Song <wenbin.song@nxp.com>2016-01-21 17:14:54 +0800
committerYork Sun <york.sun@nxp.com>2016-01-27 08:13:12 -0800
commit8e728aa915ab220e40ef68fe2b53f2fae5fbc42e (patch)
tree02c8cbaad7e57ae43123f0dddde57a3f2cd680e9 /arch
parent8c35cc3b7e2ff1d9bf44af5805e8ef5c4536ce81 (diff)
downloadblackbird-obmc-uboot-8e728aa915ab220e40ef68fe2b53f2fae5fbc42e.tar.gz
blackbird-obmc-uboot-8e728aa915ab220e40ef68fe2b53f2fae5fbc42e.zip
armv8/ls1043aqds: Spilt off board device tree
Move new /chosen node out of the board device tree. Signed-off-by: Wenbin Song <wenbin.song@nxp.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: York Sun <york.sun@nxp.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/dts/Makefile2
-rw-r--r--arch/arm/dts/fsl-ls1043a-qds-duart.dts16
-rw-r--r--arch/arm/dts/fsl-ls1043a-qds.dtsi (renamed from arch/arm/dts/fsl-ls1043a-qds.dts)1
3 files changed, 17 insertions, 2 deletions
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 641510c668..b3b0f4f231 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -97,7 +97,7 @@ dtb-$(CONFIG_LS102XA) += ls1021a-qds.dtb \
ls1021a-twr-duart.dtb ls1021a-twr-lpuart.dtb
dtb-$(CONFIG_FSL_LSCH3) += fsl-ls2080a-qds.dtb \
fsl-ls2080a-rdb.dtb
-dtb-$(CONFIG_FSL_LSCH2) += fsl-ls1043a-qds.dtb \
+dtb-$(CONFIG_FSL_LSCH2) += fsl-ls1043a-qds-duart.dtb \
fsl-ls1043a-rdb.dtb
dtb-$(CONFIG_MACH_SUN4I) += \
diff --git a/arch/arm/dts/fsl-ls1043a-qds-duart.dts b/arch/arm/dts/fsl-ls1043a-qds-duart.dts
new file mode 100644
index 0000000000..2124e38504
--- /dev/null
+++ b/arch/arm/dts/fsl-ls1043a-qds-duart.dts
@@ -0,0 +1,16 @@
+/*
+ * Device Tree file for Freescale Layerscape-1043A family SoC.
+ *
+ * Copyright (C) 2015, Freescale Semiconductor
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+/dts-v1/;
+#include "fsl-ls1043a-qds.dtsi"
+
+/ {
+ chosen {
+ stdout-path = &duart0;
+ };
+};
diff --git a/arch/arm/dts/fsl-ls1043a-qds.dts b/arch/arm/dts/fsl-ls1043a-qds.dtsi
index 74352227d4..6fa16b80b9 100644
--- a/arch/arm/dts/fsl-ls1043a-qds.dts
+++ b/arch/arm/dts/fsl-ls1043a-qds.dtsi
@@ -10,7 +10,6 @@
* warranty of any kind, whether express or implied.
*/
-/dts-v1/;
/include/ "fsl-ls1043a.dtsi"
/ {
OpenPOWER on IntegriCloud