ipq806x: move stdout-path to DTSI files

All device DTS files in the target set the stdout-path to the same
value. So, let's move the definitions to the DTSI files.

That's also where the kernel defines it (qcom-ipq8064-v1.0.dtsi).

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
index 1db75a062a4e6bc4a29105961a02c32c9fdef4d7..005087dc8a2bf88d3585d244b72bd2157160f14a 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
@@ -23,10 +23,6 @@
                serial0 = &gsbi4_serial;
                mdio-gpio0 = &mdio0;
        };
-
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
 };
 
 &adm_dma {

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts
index e8de2c3519633a5a8c5c6fadf9ef7cbef3632818..1a259e1e9b38d228a14d13b0e7420ebe6e86e2b6 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts
@@ -23,10 +23,6 @@
                serial0 = &gsbi4_serial;
                mdio-gpio0 = &mdio0;
        };
-
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
 };
 
 &qcom_pinmux {

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts
index 31354a2f0fea58595c6786e046bdb8160da55eb7..2b4c6c961c617162452b697b5bcf201646071fd4 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts
@@ -32,10 +32,6 @@
                label-mac-device = &gmac2;
        };
 
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
-
        keys {
                compatible = "gpio-keys";
                pinctrl-0 = <&button_pins>;

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
index 723c75b503c090d0e9a3fa928def50e27ba8ed6b..e1d35d7c653e07b68b0b11d38712ff9858df6e54 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
@@ -33,7 +33,6 @@
 
        chosen {
                bootargs = "rootfstype=squashfs noinitrd";
-               stdout-path = "serial0:115200n8";
        };
 
        keys {

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-db149.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-db149.dts
index 2e50cca56ab26a7fc5aef60a9820055642435be9..e29084d8a9609548eee5d59fc8fbadb77ff4dfbc 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-db149.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-db149.dts
@@ -18,10 +18,6 @@
                serial0 = &uart2;
                mdio-gpio0 = &mdio0;
        };
-
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
 };
 
 &qcom_pinmux {

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
index 0242b5e767cb6b81a680c82fb11466fc323c17ac..2bc356c7ac8cfaa5b28caf6a3d543f7b67f74949 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
@@ -33,7 +33,6 @@
 
        chosen {
                bootargs = "console=ttyMSM0,115200n8";
-               stdout-path = "serial0:115200n8";
                append-rootblock = "ubi.mtd=";  /* append to bootargs adding the root deviceblock nbr from bootloader */
        };
 

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
index 45cd6e0477914a920aa67c15a42633cf5474b809..e8833247dba1224c3d077668d6626b0f668558e8 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
@@ -34,7 +34,6 @@
 
        chosen {
                bootargs = "rootfstype=squashfs noinitrd";
-               stdout-path = "serial0:115200n8";
        };
 
        keys {

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
index dfd71bb4e7791d9b8c1181cd3cff04bd274e3fa9..3381bc9477fef7e0f04270a128c1073192a61d46 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
@@ -38,7 +38,6 @@
 
        chosen {
                bootargs = "rootfstype=squashfs noinitrd";
-               stdout-path = "serial0:115200n8";
        };
 
        keys {

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi
index cd8f4635cb397341b9618d88925c1615e7349b28..07b8143f1a03db3f2cda4228477291614f65935c 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi
@@ -1,5 +1,11 @@
 #include "qcom-ipq8064.dtsi"
 
+/ {
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+};
+
 &CPU_SPC {
        status = "okay";
 };

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi
index 467c43590b490ccd04fb29c292c0338ae16136dc..f36ca338184eda9ccbd3475a75dca4e3458e7999 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi
@@ -1,5 +1,11 @@
 #include "qcom-ipq8064.dtsi"
 
+/ {
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+};
+
 &CPU_SPC {
        status = "okay";
 };

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts
index 48d304148048d029a91f1e94d2c540db1dce43fe..2c3aa2b8b8286b4ff065911f4181906fee6d45e3 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts
@@ -31,10 +31,6 @@
                led-upgrade = &general;
        };
 
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
-
        keys {
                compatible = "gpio-keys";
                pinctrl-0 = <&button_pins>;

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts
index 07909831ed4ff4e680282bdc28528dc5a5dae107..383fe762ca809118bf18877b8d3584c125f73c3d 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts
@@ -31,10 +31,6 @@
                led-upgrade = &power_green;
        };
 
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
-
        keys {
                compatible = "gpio-keys";
                pinctrl-0 = <&button_pins>;

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts
index 29928312e536a1d8eae07d2ee8555ee90df96e17..07201adf6d14d9567433dcfbbbefa9d2a58d01e4 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts
@@ -52,10 +52,6 @@
                led-upgrade = &led_pass;
        };
 
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
-
        leds {
                compatible = "gpio-leds";
 

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts
index 6571aa4b927b09982e3a989fa6a8d65835e4dd5d..297a8c530644578053f6af213a23dac51d21242a 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts
@@ -34,7 +34,6 @@
        chosen {
                /* use "ubi_rootfs" volume in "ubi" partition as rootfs */
                bootargs = "ubi.block=0,1 root=/dev/ubiblock0_1 rootfstype=squashfs";
-               stdout-path = "serial0:115200n8";
        };
 
        leds {

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
index 6c21ae5e245340e78853c877f5e42795b777cf60..a1966578ee93828dc3b36aff21ce0dc4afe4c8a1 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
@@ -34,7 +34,6 @@
 
        chosen {
                bootargs = "rootfstype=squashfs,ext4 rootwait noinitrd";
-               stdout-path = "serial0:115200n8";
                append-rootblock = "root=/dev/mmcblk0p";
        };
 

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
index 611015f191b66b8f4afa5951ded25c2af7daf00b..7e30db26d86b3df881c456beb375dd6282dcbfbe 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
@@ -37,10 +37,6 @@
                label-mac-device = &gmac2;
        };
 
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
-
        keys {
                compatible = "gpio-keys";
                pinctrl-0 = <&button_pins>;

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065.dtsi b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065.dtsi
index a95f4a12e0515f2892506ba1f938785cb5da452c..7610ce8889e8e7db5c77eb8d8cd0e4295efb8e90 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065.dtsi
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065.dtsi
@@ -4,6 +4,10 @@
        model = "Qualcomm IPQ8065";
        compatible = "qcom,ipq8065", "qcom,ipq8064";
 
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
        cpus {
                qcom,l2 {
                        qcom,l2-cpufreq = <384000000 600000000 1400000000>;