ath79: drop and consolidate redundant chosen/bootargs

In ath79, for several SoCs the console bootargs are defined to the
very same value in every device's DTS. Consolidate these definitions
in the SoC dtsi files and drop further redundant definitions elsewhere.

The only device without any bootargs set has been OpenMesh OM5P-AC V2.
This will now inherit the setting from qca955x.dtsi

While this is a cosmetic change, backporting it to 19.07 will be a
major help for anyone doing backports of device support. Without it,
every backporter would have to remember to manually add the chosen node
to the device's DTS.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
(cherry picked from commit 635f111148c3f7ccb0ecc92863a3b1a142f6ebeb)

diff --git a/target/linux/ath79/dts/ar7100.dtsi b/target/linux/ath79/dts/ar7100.dtsi
index e3f0edccff44c4bdf8a2dcb1300598468c52a6bf..fe88cfab2d2ec3e1ec915b0d889c8229101b5adc 100644 (file)
--- a/target/linux/ath79/dts/ar7100.dtsi
+++ b/target/linux/ath79/dts/ar7100.dtsi
@@ -5,6 +5,10 @@
 / {
        compatible = "qca,ar7100";
 
+       chosen {
+               bootargs = "console=ttyS0,115200";
+       };
+
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dts b/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dts
index df22eb8dc4ce681df2d7280f38dd525b6cb49956..25633cf284f217362dbd226ac9bc950f06156b39 100644 (file)
--- a/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dts
+++ b/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dts
@@ -16,10 +16,6 @@
                led-upgrade = &diag;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,115200";
-       };
-
        extosc: ref {
                compatible = "fixed-clock";
                #clock-cells = <0>;

diff --git a/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts b/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts
index da19921973655709c81cd981e9b025ff44f57765..c2fe040dcdbec10d08f32e38061a03b5a4377f04 100644 (file)
--- a/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts
+++ b/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts
@@ -17,10 +17,6 @@
                led-upgrade = &orange_power;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,115200";
-       };
-
        extosc: ref {
                compatible = "fixed-clock";
                #clock-cells = <0>;

diff --git a/target/linux/ath79/dts/ar7161_netgear_wndr3700.dtsi b/target/linux/ath79/dts/ar7161_netgear_wndr3700.dtsi
index 3d256baa0e3d45f874bbbde15ef0c9e6da3669ca..8f105b5db9709e6bbf1a1fa0864a46c45442f3c8 100644 (file)
--- a/target/linux/ath79/dts/ar7161_netgear_wndr3700.dtsi
+++ b/target/linux/ath79/dts/ar7161_netgear_wndr3700.dtsi
@@ -14,10 +14,6 @@
                led-upgrade = &power_orange;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,115200";
-       };
-
        extosc: ref {
                compatible = "fixed-clock";
                #clock-cells = <0>;

diff --git a/target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi b/target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi
index 6e4361f10f248e8cb0a5ff1e1be81b5a96d8faf7..ed01e991ff0aa54cfa6f6e4fcf3b22de0ff7c69e 100644 (file)
--- a/target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi
+++ b/target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi
@@ -7,10 +7,6 @@
 #include "ar7100.dtsi"
 
 / {
-       chosen {
-               bootargs = "console=ttyS0,115200";
-       };
-
        aliases {
                led-boot = &rf;
                led-failsafe = &rf;

diff --git a/target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi b/target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi
index b49d3458fe02388d9e3a0ee088f779cf2cffb94f..3b1b373cb382775b1f9e5b5d8b35829788c21f56 100644 (file)
--- a/target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi
+++ b/target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi
@@ -7,10 +7,6 @@
 #include "ar9344.dtsi"
 
 / {
-       chosen {
-               bootargs = "console=ttyS0,115200";
-       };
-
        keys {
                compatible = "gpio-keys";
 

diff --git a/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts b/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
index 25c1d050da914536780981b2e426605fabab3a0a..d196cc7ea77581d248226def8c5ab5d087962e0e 100644 (file)
--- a/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
@@ -10,10 +10,6 @@
        compatible = "tplink,archer-d50-v1", "qca,qca9531";
        model = "TP-Link Archer D50 v1";
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        gpio_leds: leds {
                compatible = "gpio-leds";
 

diff --git a/target/linux/ath79/dts/qca9531_yuncore_a770.dts b/target/linux/ath79/dts/qca9531_yuncore_a770.dts
index 18ad6307a1d5bbdc45906b0b4639a287d8ffc530..5af3dd6e67bd8e10c1fb93e21080992261d26f97 100644 (file)
--- a/target/linux/ath79/dts/qca9531_yuncore_a770.dts
+++ b/target/linux/ath79/dts/qca9531_yuncore_a770.dts
@@ -17,10 +17,6 @@
                led-upgrade = &status;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        keys {
                compatible = "gpio-keys";
 

diff --git a/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi b/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi
index ae9cb24aa017e0ae3f24af1728f6df134e9bbf23..35f17a41efe4640d0583fe1dea4cf50158dbb85b 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi
@@ -7,10 +7,6 @@
 #include "qca953x.dtsi"
 
 / {
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &led_link4;
                led-failsafe = &led_link4;

diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi
index e1d0db87dd2d593a9c4a5d9ddba2ea3328f6410c..44c6394a26027e9908868d5502323096d0f6e6a5 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi
@@ -13,10 +13,6 @@
                led-upgrade = &led_system;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        leds {
                compatible = "gpio-leds";
 

diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi
index adf75c786e6f906e37cfdd649eb902d9c3d5c637..fa12e0386a94c1d89e61c7796f1023eabbb7a2bf 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi
@@ -6,10 +6,6 @@
 #include "qca953x.dtsi"
 
 / {
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &led_system;
                led-failsafe = &led_system;

diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
index 34f242ac5625f7b0d6f8a5e99aa7af3f0469a2bf..ee2441989a1514153c50d0410e3500ccf7e8a29e 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
@@ -7,10 +7,6 @@
 #include "qca953x.dtsi"
 
 / {
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        gpio_leds: leds {
                compatible = "gpio-leds";
 

diff --git a/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi b/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi
index d4faee7506cf0f36c4ab2e81b7cd556df0690055..8047d89d9a5b753b87bad264a662be21dee1c571 100644 (file)
--- a/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi
+++ b/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi
@@ -7,10 +7,6 @@
 #include "qca953x.dtsi"
 
 / {
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &led_system;
                led-failsafe = &led_system;

diff --git a/target/linux/ath79/dts/qca9557.dtsi b/target/linux/ath79/dts/qca9557.dtsi
index b29dfc72b26a7509cff708108dfe9e8dea1290c6..24efb35fc50038a8816f967e96493437f99c4c2e 100644 (file)
--- a/target/linux/ath79/dts/qca9557.dtsi
+++ b/target/linux/ath79/dts/qca9557.dtsi
@@ -8,6 +8,10 @@
        #address-cells = <1>;
        #size-cells = <1>;
 
+       chosen {
+               bootargs = "console=ttyS0,115200n8";
+       };
+
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts b/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts
index 995ecb3b73790acf11b41272ecad825bb32fe550..c927fdeaf48753b43061578a57ac53943b05ad41 100644 (file)
--- a/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts
+++ b/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts
@@ -17,10 +17,6 @@
                led-upgrade = &power;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        leds {
                compatible = "gpio-leds";
 

diff --git a/target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi b/target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi
index 86b97437ea140e867e1b724bcc8639e52d587fd8..2c65882cf69f48977ee72d668ec541eab66a5cac 100644 (file)
--- a/target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi
+++ b/target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi
@@ -14,10 +14,6 @@
                led-upgrade = &power;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        leds: leds {
                compatible = "gpio-leds";
 

diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi b/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
index 9937186b1eea56587190de4f4424a01d996f299c..d50290b3a8107a7faf651c3ca239c21a50e7ba9d 100644 (file)
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
@@ -18,10 +18,6 @@
 #include "qca9557.dtsi"
 
 / {
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        keys {
                compatible = "gpio-keys";
 

diff --git a/target/linux/ath79/dts/qca9558_engenius_ecb1750.dts b/target/linux/ath79/dts/qca9558_engenius_ecb1750.dts
index 27f0313019708144b88bab9c96cdf923ac4b73f2..28d2e341fd17baa06baa01e133138622a0a8bff6 100644 (file)
--- a/target/linux/ath79/dts/qca9558_engenius_ecb1750.dts
+++ b/target/linux/ath79/dts/qca9558_engenius_ecb1750.dts
@@ -10,10 +10,6 @@
        compatible = "engenius,ecb1750", "qca,qca9557";
        model = "EnGenius ECB1750";
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &power_orange;
                led-failsafe = &power_orange;

diff --git a/target/linux/ath79/dts/qca9558_engenius_epg5000.dts b/target/linux/ath79/dts/qca9558_engenius_epg5000.dts
index 6179150fdb899656eba46ea3c2eb78c59ec42380..67b76ebcc5e57316f0c91d597bd3fe7a42c6830d 100644 (file)
--- a/target/linux/ath79/dts/qca9558_engenius_epg5000.dts
+++ b/target/linux/ath79/dts/qca9558_engenius_epg5000.dts
@@ -10,10 +10,6 @@
        model = "EnGenius EPG5000";
        compatible = "engenius,epg5000", "qca,qca9557";
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &power;
                led-failsafe = &power;

diff --git a/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts b/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts
index 3b7e3aceda659d273afe04e84849bab47c8478de..42c64b5bc3f5163fcbf234dede256d6b36ef9242 100644 (file)
--- a/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts
+++ b/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts
@@ -10,10 +10,6 @@
        compatible = "librerouter,librerouter-v1", "qca,qca9558";
        model = "LibreRouter v1";
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &system;
                led-failsafe = &system;

diff --git a/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi b/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi
index 285601f3cf7134e080b350cc21895f6b75b661f7..fe7e88ad43447ebd2bf02cbbfe6bb89a1a653bd5 100644 (file)
--- a/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi
+++ b/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi
@@ -7,10 +7,6 @@
 #include "qca9557.dtsi"
 
 / {
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &power_green;
                led-failsafe = &power_amber;

diff --git a/target/linux/ath79/dts/qca9558_ocedo_koala.dts b/target/linux/ath79/dts/qca9558_ocedo_koala.dts
index 23835492a3141ab13958f22179480a2e3aa2925c..b2c97e1de20998bc40725c44e5f2cbb153cd128e 100644 (file)
--- a/target/linux/ath79/dts/qca9558_ocedo_koala.dts
+++ b/target/linux/ath79/dts/qca9558_ocedo_koala.dts
@@ -10,10 +10,6 @@
        compatible = "ocedo,koala", "qca,qca9557";
        model = "OCEDO Koala";
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &system;
                led-failsafe = &system;

diff --git a/target/linux/ath79/dts/qca9558_ocedo_ursus.dts b/target/linux/ath79/dts/qca9558_ocedo_ursus.dts
index 4914e03ba2787c8bc3068575e18251027f23de6c..9f1924ee418f1baabe2d28ef2785b614a7496415 100644 (file)
--- a/target/linux/ath79/dts/qca9558_ocedo_ursus.dts
+++ b/target/linux/ath79/dts/qca9558_ocedo_ursus.dts
@@ -10,10 +10,6 @@
        compatible = "ocedo,ursus", "qca,qca9558";
        model = "OCEDO Ursus";
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        leds {
                compatible = "gpio-leds";
 

diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-c7.dtsi b/target/linux/ath79/dts/qca9558_tplink_archer-c7.dtsi
index 343d318e0b49704babb0b378e67e2c6f5d3a5012..fa3069b764d680bcf8fd5f24c5eaf03908d43c67 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_archer-c7.dtsi
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-c7.dtsi
@@ -7,10 +7,6 @@
 #include "qca9557.dtsi"
 
 / {
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &system;
                led-failsafe = &system;

diff --git a/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts b/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts
index 056b513d7e0451ba72626ea4b94b77feb0f9e8ac..adeea716e20ba348f1487f405bf2dd602edfa32c 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts
@@ -18,10 +18,6 @@
                mdio-gpio0 = &mdio2;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        keys {
                compatible = "gpio-keys";
 

diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts b/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts
index 3cc2d790d4a2a3f0ec24efbe8139e0ab1f3bb8e0..cbc64dbf85a1c463da1b37b47eb5f6da252fce15 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts
@@ -10,10 +10,6 @@
        compatible = "tplink,tl-wdr4900-v2", "qca,qca9558";
        model = "TP-Link TL-WDR4900 v2";
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &led_system;
                led-failsafe = &led_system;

diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
index 61d4aec6243a15ff3cad94cdb8d7da15fd07f91b..35a866ebea8ee4449d002fd1152a9c9a124fad44 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
+++ b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
@@ -7,10 +7,6 @@
 #include "qca9557.dtsi"
 
 / {
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &system;
                led-failsafe = &system;

diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts b/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts
index c33fe7404ac01b52df3455338cfdde2e98eb3cfb..770e6cdb10b2c43252d8961af5c38943315706cf 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts
@@ -10,10 +10,6 @@
        compatible = "tplink,tl-wr941n-v7-cn", "qca,qca9558";
        model = "TP-Link TL-WR941N v7 (CN)";
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &led_system;
                led-failsafe = &led_system;

diff --git a/target/linux/ath79/dts/qca9561_avm_fritz4020.dts b/target/linux/ath79/dts/qca9561_avm_fritz4020.dts
index 9d548353efdc45c1ea98e8db2df3fb7405477fcf..72962c1cd1b7f8509bc4a3b06f97340e07eb375f 100644 (file)
--- a/target/linux/ath79/dts/qca9561_avm_fritz4020.dts
+++ b/target/linux/ath79/dts/qca9561_avm_fritz4020.dts
@@ -17,10 +17,6 @@
                led-upgrade = &info_red;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        led_spi {
                compatible = "spi-gpio";
                #address-cells = <1>;

diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts
index 3c971b546400e9c33f532094d7d2d71190279982..5cbbbdbbc969817ee09eff1fa53e3169a2c6e915 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts
@@ -10,10 +10,6 @@
        compatible = "tplink,archer-c25-v1", "qca,qca9561";
        model = "TP-Link Archer C25 v1";
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        led_spi {
                compatible = "spi-gpio";
                #address-cells = <1>;

diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi b/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi
index dc56bf682a06a3f33ce07d67498af40f049157eb..3e63317ce00926a5d6291e9b28159f24cd723ea5 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi
@@ -8,10 +8,6 @@
 / {
        compatible = "tplink,archer-c5x", "qca,qca9560";
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        led_spi {
                compatible = "spi-gpio";
                #address-cells = <1>;

diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi b/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi
index 6c015fcdd9cad3419beb3f26c374b3d67e9ea217..65f209e9b02e0a3a26b84b18e47feede52225db7 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi
@@ -6,10 +6,6 @@
 #include "qca956x.dtsi"
 
 / {
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &led_power;
                led-failsafe = &led_power;

diff --git a/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts b/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts
index 8b8818c82fbc628f25ba4d7ae087d4d76dd25aa7..51f232ccf60ac405927d328572737ad9a26e2905 100644 (file)
--- a/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts
+++ b/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts
@@ -17,10 +17,6 @@
                led-upgrade = &led_red;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;

diff --git a/target/linux/ath79/dts/qca9563_dlink_dir-859-a1.dts b/target/linux/ath79/dts/qca9563_dlink_dir-859-a1.dts
index c0e0cc747341ec0710c5991a7882286646de11a1..fe59f2fd1c0eae485e7be75f5826686d22c01d31 100644 (file)
--- a/target/linux/ath79/dts/qca9563_dlink_dir-859-a1.dts
+++ b/target/linux/ath79/dts/qca9563_dlink_dir-859-a1.dts
@@ -17,10 +17,6 @@
                led-upgrade = &power;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        leds {
                compatible = "gpio-leds";
 

diff --git a/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi b/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi
index 2f5c2c4aac8a6a36102bd3d5781993ca831e415d..34f004832a53fdd51a81c038709b0386c0ad63bd 100644 (file)
--- a/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi
+++ b/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi
@@ -7,10 +7,6 @@
 #include "qca956x.dtsi"
 
 / {
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &power;
                led-failsafe = &power;

diff --git a/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dts b/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dts
index 0145a24fbae2cdbe6fb6445607795af6b792352d..03922bcd1fe9a453d5916537609317b94eea18c6 100644 (file)
--- a/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dts
+++ b/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dts
@@ -10,10 +10,6 @@
        compatible = "glinet,gl-ar750s", "qca,qca9563";
        model = "GL.iNet GL-AR750S";
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &power;
                led-failsafe = &power;

diff --git a/target/linux/ath79/dts/qca9563_nec_wg1200cr.dts b/target/linux/ath79/dts/qca9563_nec_wg1200cr.dts
index 8c356bd7542ca5bf38ae4fc9bf51df066e878c5f..03aaceb4280a1e63059c5108dce64fdc62059910 100644 (file)
--- a/target/linux/ath79/dts/qca9563_nec_wg1200cr.dts
+++ b/target/linux/ath79/dts/qca9563_nec_wg1200cr.dts
@@ -10,10 +10,6 @@
        model = "NEC Aterm WG1200CR";
        compatible = "nec,wg1200cr", "qca,qca9563";
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &power_green;
                led-failsafe = &power_red;

diff --git a/target/linux/ath79/dts/qca9563_nec_wg800hp.dts b/target/linux/ath79/dts/qca9563_nec_wg800hp.dts
index 9cba99b6a6eb1523be81c6065c1cdb2d8e41c96b..f4d1ce10d1864697d4e88fe9130196e6f1a68dcd 100644 (file)
--- a/target/linux/ath79/dts/qca9563_nec_wg800hp.dts
+++ b/target/linux/ath79/dts/qca9563_nec_wg800hp.dts
@@ -10,10 +10,6 @@
        model = "NEC Aterm WG800HP";
        compatible = "nec,wg800hp", "qca,qca9563";
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &power_green;
                led-failsafe = &power_red;

diff --git a/target/linux/ath79/dts/qca9563_phicomm_k2t.dts b/target/linux/ath79/dts/qca9563_phicomm_k2t.dts
index d819a76fd24a9610c1dab5279b55797732e01b8d..9a12665397e342ff6f92109f19a2038998b5e1da 100644 (file)
--- a/target/linux/ath79/dts/qca9563_phicomm_k2t.dts
+++ b/target/linux/ath79/dts/qca9563_phicomm_k2t.dts
@@ -17,10 +17,6 @@
                led-upgrade = &status_red;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        leds {
                compatible = "gpio-leds";
 

diff --git a/target/linux/ath79/dts/qca9563_rosinson_wr818.dts b/target/linux/ath79/dts/qca9563_rosinson_wr818.dts
index faa8105e8c1847e259119f76252f280145e192be..31e19dda4bafed7152d609dbee4e4806447c4e95 100644 (file)
--- a/target/linux/ath79/dts/qca9563_rosinson_wr818.dts
+++ b/target/linux/ath79/dts/qca9563_rosinson_wr818.dts
@@ -10,10 +10,6 @@
        model = "ROSINSON WR818";
        compatible = "rosinson,wr818", "qca,qca9563";
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &system;
                led-failsafe = &system;

diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts
index 782a581acaf69a65861feef8ec7b1d34ecddbb39..c0dbf995be07ad5ca00a36c564312cb02f80f443 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts
@@ -10,10 +10,6 @@
        compatible = "tplink,archer-c2-v3", "qca,qca9563";
        model = "TP-Link Archer C2 v3";
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &system;
                led-failsafe = &system;

diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts
index 24588d8216727e0508e0ec64a7a6c2b5c9cdfa51..b6425e21c8503dff2b3a1357d23c85ca42ec5e06 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts
@@ -10,10 +10,6 @@
        compatible = "tplink,archer-c7-v4", "qca,qca9563";
        model = "TP-Link Archer C7 v4";
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &system;
                led-failsafe = &system;

diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-x6-v2.dtsi b/target/linux/ath79/dts/qca9563_tplink_archer-x6-v2.dtsi
index ac10d9134a64f4c14941e5ee24abdb7332abab5a..203c5bdb217c17e43b94ae3c7dadf1ec9e0480aa 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_archer-x6-v2.dtsi
+++ b/target/linux/ath79/dts/qca9563_tplink_archer-x6-v2.dtsi
@@ -7,10 +7,6 @@
 #include "qca956x.dtsi"
 
 / {
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &power;
                led-failsafe = &power;

diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi b/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi
index 324d8312492a958a82f17789a5587f165d3ffe80..002a71850c71f7601dea882ccf30c8032d01879f 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi
+++ b/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi
@@ -7,10 +7,6 @@
 #include "qca956x.dtsi"
 
 / {
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &system;
                led-failsafe = &system;

diff --git a/target/linux/ath79/dts/qca9563_tplink_re450-v2.dts b/target/linux/ath79/dts/qca9563_tplink_re450-v2.dts
index 36e5ef81db7da8bc8b0733faf7d6e3887548b2be..fcf861a7c69311397a67027c933602eb4ede82fb 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_re450-v2.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_re450-v2.dts
@@ -10,10 +10,6 @@
        compatible = "tplink,re450-v2", "qca,qca9563";
        model = "TP-Link RE450 v2";
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &system;
                led-failsafe = &system;

diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi
index 42b4b6b8c6746ca05aaffd66d4719d0abb5df35b..c66f541d0ac96580bb233997cd3efb430624fe03 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi
+++ b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi
@@ -7,10 +7,6 @@
 #include "qca956x.dtsi"
 
 / {
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &system;
                led-failsafe = &system;

diff --git a/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi b/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi
index fdd4a01d867dfdf80651c4fddc81d7f3693c2780..7f72155c0f1d459e03d1f03677151000b1c187d2 100644 (file)
--- a/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi
+++ b/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi
@@ -13,10 +13,6 @@
                led-upgrade = &led_blue;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        leds {
                compatible = "gpio-leds";
 

diff --git a/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi b/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi
index e336cca0e0c05ff7e0f5c9395d1f7968c06b7048..67d5f908302a680d2285a9f9c26e959db40fc4e7 100644 (file)
--- a/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi
+++ b/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi
@@ -7,10 +7,6 @@
 #include "qca956x.dtsi"
 
 / {
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        keys {
                compatible = "gpio-keys";
 

diff --git a/target/linux/ath79/dts/qca956x.dtsi b/target/linux/ath79/dts/qca956x.dtsi
index ee645aa02f052c22e1762e775738ea74b01a75c7..83fb27b83787a78fe9266fc379296bfd4d6b1f4a 100644 (file)
--- a/target/linux/ath79/dts/qca956x.dtsi
+++ b/target/linux/ath79/dts/qca956x.dtsi
@@ -8,6 +8,10 @@
        #address-cells = <1>;
        #size-cells = <1>;
 
+       chosen {
+               bootargs = "console=ttyS0,115200n8";
+       };
+
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/target/linux/ath79/dts/tp9343_tplink_tl-wx.dtsi b/target/linux/ath79/dts/tp9343_tplink_tl-wx.dtsi
index c497860f116abb24b77cf9297d15511762234ad5..1b4a547cc68a9c99b0db0fa4238d2745adfc23e3 100644 (file)
--- a/target/linux/ath79/dts/tp9343_tplink_tl-wx.dtsi
+++ b/target/linux/ath79/dts/tp9343_tplink_tl-wx.dtsi
@@ -5,12 +5,6 @@
 
 #include "qca956x.dtsi"
 
-/ {
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-};
-
 &spi {
        status = "okay";