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

Note that while this tidies up master a lot, it might develop into a
frequent pitfall for backports.

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

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/ar7100_mikrotik_routerboard-4xx.dtsi b/target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi
index e957a51e27be8212f81f57b9862804d0a0de3d24..58753b6d4a590cd96dd5e438568ab0041fa83ad2 100644 (file)
--- a/target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi
+++ b/target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi
@@ -12,10 +12,6 @@
                led-running = &led_user;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,115200";
-       };
-
        leds {
                compatible = "gpio-leds";
 

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 b3855eff06ddb3007da10334cf7aadb6f9d8d9a3..43f35683bdf40a9b4fa9ce593793caf81aa267d6 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 = &led_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 5e35dddd4b53d417668d79071f2099a7117651d3..bb6c31da9e70e81e69cc6475c25c657d2f9455b8 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 = &led_power_orange;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,115200";
-       };
-
        extosc: ref {
                compatible = "fixed-clock";
                #clock-cells = <0>;

diff --git a/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi b/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi
index f1db1ffd5886f7c2cf474f94dd6b7fcd599ad625..87c619aa0368342629c7b9a28fe3df921b0f4fc8 100644 (file)
--- a/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi
+++ b/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi
@@ -14,10 +14,6 @@
                label-mac-device = &eth0;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,115200";
-       };
-
        extosc: ref {
                compatible = "fixed-clock";
                #clock-cells = <0>;

diff --git a/target/linux/ath79/dts/ar7161_siemens_ws-ap3610.dts b/target/linux/ath79/dts/ar7161_siemens_ws-ap3610.dts
index 8e0a80cb328ed92e0d5b7d1930f35744baf1997a..5ebfb4c872ce78f903ee882aa3fbb1984b673a69 100644 (file)
--- a/target/linux/ath79/dts/ar7161_siemens_ws-ap3610.dts
+++ b/target/linux/ath79/dts/ar7161_siemens_ws-ap3610.dts
@@ -10,10 +10,6 @@
        compatible = "siemens,ws-ap3610", "qca,ar7161";
        model = "Siemens WS-AP3610";
 
-       chosen {
-               bootargs = "console=ttyS0,115200";
-       };
-
        aliases {
                led-boot = &led_power_green;
                led-failsafe = &led_power_red;

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

diff --git a/target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi b/target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi
index 9d9af23bab709b428cfb1af9522fe0fd061b3373..82d232d444c452c7cd6450cf2f4e08c798b5cbf9 100644 (file)
--- a/target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi
+++ b/target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi
@@ -6,10 +6,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 130944f4f5ca33ef9e84616b54ffdbf83379eb5d..3aa6bd1367b0e24d3930bfe7f5262a5b4cf24d08 100644 (file)
--- a/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
@@ -18,10 +18,6 @@
                label-mac-device = &wmac;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        leds {
                compatible = "gpio-leds";
 

diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts b/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts
index 4f5a29cfa01eaf80c1bce7872ddb274dc366b2b3..0e338fe012b900e74f75d1eb714843dab774208e 100644 (file)
--- a/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts
@@ -18,10 +18,6 @@
                label-mac-device = &wmac;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        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 1caae75f1d4f5f6a6051ac16d8b688798f3eb13f..21283d98dfade5bb4e06161576f83c20b4b65043 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 = &led_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 e0505e572475bc5cfa326c23b29f6b7cbbeb0309..fb805ff66ab89662f59ffb7a8a77bb8d60844a6e 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi
@@ -6,10 +6,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 546a87a9b65f84c6420475180e69e7799ee49806..19d101f8cc42651ec65f0dcbcc7b24d998084499 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi
@@ -14,10 +14,6 @@
                led-upgrade = &led_system;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        leds {
                compatible = "gpio-leds";
 

diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts b/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts
index 52369120473b5b1cb56b09504a62ece678d68853..f2e2dee04f1208d626d6f5813d749779bae4a309 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts
@@ -18,10 +18,6 @@
                label-mac-device = &wmac;
        };
 
-       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 f89d020672c1e64a54a9f80931f03f0169e91acd..df920c842f3a795f7ee4be6e25ad1bca76234e03 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 3559481f7d316d64f24b8948ae787e36b538b0f6..ade5dec7185d2ef9e829da5257702f3b2eaae59c 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
@@ -6,10 +6,6 @@
 #include "qca953x.dtsi"
 
 / {
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                label-mac-device = &wmac;
        };

diff --git a/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi b/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi
index b24ed1fb14a4f8208b160959b9d96fd78544ae41..fcfd82702cd8ceed112f61fd7bc02c20925d4d32 100644 (file)
--- a/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi
+++ b/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.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/qca9556_avm_fritz-repeater.dtsi b/target/linux/ath79/dts/qca9556_avm_fritz-repeater.dtsi
index 13e0b3371a693ddbec22285df5952dd19ceb6bd9..9d1899539502bb580ee19493ed5d03df7cc56bb2 100644 (file)
--- a/target/linux/ath79/dts/qca9556_avm_fritz-repeater.dtsi
+++ b/target/linux/ath79/dts/qca9556_avm_fritz-repeater.dtsi
@@ -7,10 +7,6 @@
 #include "qca955x.dtsi"
 
 / {
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        keys {
                compatible = "gpio-keys";
 

diff --git a/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts b/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts
index feae550039c09b38b995be13216f91438c11cc42..c5c51b68796bf2207e1621a228da0b267943d0d2 100644 (file)
--- a/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts
+++ b/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts
@@ -15,10 +15,6 @@
                serial0 = &uart;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        keys {
                compatible = "gpio-keys";
 

diff --git a/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts b/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts
index 7f6c6b5889b2ba2fc8a5746e3a8079296eed7a57..d7380bac38e831c0def8c45d4e6acd4be32d744a 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 = &led_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 2b199bfa4893b12fa3fbe031528c6d82cf4e635d..78ee3a39db6be00c297ab0c4159f69a143ccdb53 100644 (file)
--- a/target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi
+++ b/target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi
@@ -13,10 +13,6 @@
                led-upgrade = &led_power;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        leds: leds {
                compatible = "gpio-leds";
 

diff --git a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi
index e2a71c0ce6508309fa90c09fa3386e2e45926cb1..1a93a023afafbe0cc2d7427f0b70cc1d79c41e5b 100644 (file)
--- a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi
+++ b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi
@@ -6,10 +6,6 @@
 #include "qca955x.dtsi"
 
 / {
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        keys {
                compatible = "gpio-keys";
 

diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi b/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
index fc15dd44163891be2b0f9d86a90646c5aea6662d..208d6e3580f560530609e1aa25c1d20fa64ea4ff 100644 (file)
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
@@ -16,10 +16,6 @@
 #include "qca955x.dtsi"
 
 / {
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        keys {
                compatible = "gpio-keys";
 

diff --git a/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts b/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts
index 4ae9ee2b47fc702b0a72ecb9389e756c60f463e9..2c17ab8b61100886362aef53fb00294ed4e23c8f 100644 (file)
--- a/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts
+++ b/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts
@@ -10,10 +10,6 @@
        compatible = "dlink,dap-2695-a1", "qca,qca9558";
        model = "D-link DAP-2695-A1";
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &led_power_red;
                led-failsafe = &led_power_red;

diff --git a/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts b/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts
index 5e6e44be749ad8f3c1482ce37416632f641d6999..876e3d118c8643d122c33e1d0a427b1ebefdcd79 100644 (file)
--- a/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts
+++ b/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts
@@ -10,10 +10,6 @@
        compatible = "domywifi,dw33d", "qca,qca9558";
        model = "DomyWifi DW33D";
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &led_system;
                led-failsafe = &led_system;

diff --git a/target/linux/ath79/dts/qca9558_engenius_ecb1750.dts b/target/linux/ath79/dts/qca9558_engenius_ecb1750.dts
index 15286b76704a037acaafb2f97aac5cb88a48bbc5..a1efcaffe13e089be02ab5947275ad0440f8b351 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,qca9558";
        model = "EnGenius ECB1750";
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &led_power_orange;
                led-failsafe = &led_power_orange;

diff --git a/target/linux/ath79/dts/qca9558_engenius_epg5000.dts b/target/linux/ath79/dts/qca9558_engenius_epg5000.dts
index 94daefbb7915e257b3e074fb36f266842bd1f959..eccd3a968dc9245ded9b6138e314fb5d9ba4ee3c 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,qca9558";
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &led_power;
                led-failsafe = &led_power;

diff --git a/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts b/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts
index ef00d1807beb179df89e8695689bdbbc5d709123..8a55abd244e5bd567eafb98bc0ee39c8a0e1477d 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 = &led_system;
                led-failsafe = &led_system;

diff --git a/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts b/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts
index 391c034dab7472047306709efd1c044ee801bb50..a3f42f87bfe53ddff9ab5ee94d0a2b4dc5ba8422 100644 (file)
--- a/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts
+++ b/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts
@@ -17,10 +17,6 @@
                serial0 = &uart;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        leds {
                compatible = "gpio-leds";
 

diff --git a/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi b/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi
index 19b6d5c8cbcc993e9d44e9f5c5b29dfa54cf11a7..c15c5c023b31f6417c9561678bf0735d233e0e82 100644 (file)
--- a/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi
+++ b/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi
@@ -6,10 +6,6 @@
 #include "qca955x.dtsi"
 
 / {
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &led_power_green;
                led-failsafe = &led_power_amber;

diff --git a/target/linux/ath79/dts/qca9558_ocedo_koala.dts b/target/linux/ath79/dts/qca9558_ocedo_koala.dts
index b3934a90d4931c686bda295e6c61806069f57955..ff4230c3b5ba66e9d6ac35538c3b28446d627ef5 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,qca9558";
        model = "OCEDO Koala";
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &led_system;
                led-failsafe = &led_system;

diff --git a/target/linux/ath79/dts/qca9558_ocedo_ursus.dts b/target/linux/ath79/dts/qca9558_ocedo_ursus.dts
index d629f5b6bafb1b816766126c75cf2371b1fc8a16..a97e36aad36b62b5e041c0adbd57b01f0a1b039e 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_sitecom_wlr-8100.dts b/target/linux/ath79/dts/qca9558_sitecom_wlr-8100.dts
index 98f2789564acbd2295f6f3e860bcd5ded9b8a891..ba3a338912f6b930497d0b4d959c947144e7e7f0 100644 (file)
--- a/target/linux/ath79/dts/qca9558_sitecom_wlr-8100.dts
+++ b/target/linux/ath79/dts/qca9558_sitecom_wlr-8100.dts
@@ -10,10 +10,6 @@
        model = "Sitecom WLR-8100 (X8 AC1750)";
        compatible = "sitecom,wlr-8100", "qca,qca9558";
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &led_status_amber;
                led-failsafe = &led_status_amber;

diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi b/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi
index 1a550137dd730f9b4e39246a2bba9ae2ede940dc..1f3d0b8d7b6e25584c6436653e4dd58f9eb8dee8 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi
@@ -6,10 +6,6 @@
 #include "qca955x.dtsi"
 
 / {
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &led_system;
                led-failsafe = &led_system;

diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi b/target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi
index aab8eac7ce80c678fd6a5f22539eeacabc7bf7e1..2d63671700809a3903edae182c01addbe12ea1d2 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi
@@ -6,10 +6,6 @@
 #include "qca955x.dtsi"
 
 / {
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &led_system;
                led-failsafe = &led_system;

diff --git a/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts b/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts
index 8e79e126171640dbaf0f8c491a1806a5a152b431..887b6eea5f549f97f4bd913ebd5bba4f510b7c64 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_rex5x.dtsi b/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi
index 2dde5585cd3ceb2cce031d28069960b9b3c6f0c2..618f0d434b0481d289235c4548f39f0a1b9a79da 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi
+++ b/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi
@@ -6,10 +6,6 @@
 #include "qca955x.dtsi"
 
 / {
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &led_power;
                led-failsafe = &led_power;

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 0003bd1924764dcddf2256db1416d5093007c85d..70fcfd352459ae4ec9e8fdb279f4d39f9943392e 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 8a39a10ba599f6bd9d88131249e97c0b10675045..aca5745ff30533896d5f4d0beae53bd014f61982 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
+++ b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
@@ -6,10 +6,6 @@
 #include "qca955x.dtsi"
 
 / {
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &led_system;
                led-failsafe = &led_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 fb60631a3cc1d4c48d7c35bec7f9fd852b27bdba..bcd9e4d18b7b7eadbfe6d0c0bdb491a7ffd8900c 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/qca9558_trendnet_tew-823dru.dts b/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts
index fb7d5fe40c83b17919d68c11478b1181d9e4071e..e23a5991b18c545abaee0c35e7bf79c70a22fdaf 100644 (file)
--- a/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts
+++ b/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts
@@ -10,10 +10,6 @@
        compatible = "trendnet,tew-823dru", "qca,qca9558";
        model = "TRENDNET TEW-823DRU";
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &led_power_green;
                led-failsafe = &led_power_green;

diff --git a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
index ac4a70fbde30cd3a80f68a93068154250cd5912a..ade9159fcf8a2131c84d3b9098fb0ccdf0d95399 100644 (file)
--- a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
+++ b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
@@ -10,10 +10,6 @@
        compatible = "zyxel,nbg6716", "qca,qca9558";
        model = "ZyXEL NBG6716";
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &led_power;
                led-failsafe = &led_power;

diff --git a/target/linux/ath79/dts/qca955x.dtsi b/target/linux/ath79/dts/qca955x.dtsi
index 5bcaccaa14b800934ba52b1ffd807fccc8b29a18..ff8ac70d73c9a77f7a3d3f3a3c5927a03f873bfb 100644 (file)
--- a/target/linux/ath79/dts/qca955x.dtsi
+++ b/target/linux/ath79/dts/qca955x.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/qca955x_ubnt_xc.dtsi b/target/linux/ath79/dts/qca955x_ubnt_xc.dtsi
index bd8ebaf04058b61b85a31168a2f705d205eae5d8..b27a9c2fe8ac96ec2461b517689fb92b4e5c4a86 100644 (file)
--- a/target/linux/ath79/dts/qca955x_ubnt_xc.dtsi
+++ b/target/linux/ath79/dts/qca955x_ubnt_xc.dtsi
@@ -5,12 +5,6 @@
 
 #include "qca955x.dtsi"
 
-/ {
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-};
-
 &uart {
        status = "okay";
 };

diff --git a/target/linux/ath79/dts/qca9561_avm_fritz4020.dts b/target/linux/ath79/dts/qca9561_avm_fritz4020.dts
index 75cc5761ba7b1cfa0944f11b8fb9e7177dc41a88..7c13c3e47005d82977c7383c6439c15f68e2b2fb 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 = &led_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 e7b30df81f0a5347815a887856e333f97527fa38..7078da479ea14827d74869e8373a98d1b27a7eaf 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";
-       };
-
        aliases {
                led-boot = &led_power;
                led-failsafe = &led_power;

diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi b/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi
index c8e4710b39a1a1efd79d15304067a237eed33eef..4d1eb641602d281cf965700cc1f16148da3c2484 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi
@@ -16,10 +16,6 @@
                label-mac-device = &eth1;
        };
 
-       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 b1b166d89a6d0a5e0cf39b0217e0b19b1d1f2872..993c6acc56b775013683ee6e0016b8f2de11cf37 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 e4c737b8ffd03c45b08a494e9bd01db4585734a9..5f1748f93674722da34d9461fd8cc3a9bc12eb02 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";
 

diff --git a/target/linux/ath79/dts/qca9563_dlink_dir-842-c.dtsi b/target/linux/ath79/dts/qca9563_dlink_dir-842-c.dtsi
index 6b2fb1c4a0c9fdf6e1b2b9b3fa824a4f690d5b58..5e2c614dfc320a294f706c7eab18bcf69d0f1bdb 100644 (file)
--- a/target/linux/ath79/dts/qca9563_dlink_dir-842-c.dtsi
+++ b/target/linux/ath79/dts/qca9563_dlink_dir-842-c.dtsi
@@ -6,10 +6,6 @@
 #include "qca956x.dtsi"
 
 / {
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        keys {
                compatible = "gpio-keys";
 

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 8502bed4c528f4de319f6161a92aaaf7bac38f13..b9e413a265246c51c7ecb013b2c31dd1d2a082ee 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 = &led_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 9395c7b26f8cf43f69ed7fdc6d0e5865d3b6f80a..8df752a2ecbe535cc00524700cfc18430f5c844a 100644 (file)
--- a/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi
+++ b/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.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/qca9563_glinet_gl-ar750s.dtsi b/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi
index 8a00029c658932d74458763773c7829f2dc90152..6111b968a2860ebc5257aac2328c67d85c1e3fa3 100644 (file)
--- a/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi
+++ b/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi
@@ -9,10 +9,6 @@
        compatible = "glinet,gl-ar750s", "qca,qca9563";
        model = "GL.iNet GL-AR750S";
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &led_power;
                led-failsafe = &led_power;

diff --git a/target/linux/ath79/dts/qca9563_nec_wg1200cr.dts b/target/linux/ath79/dts/qca9563_nec_wg1200cr.dts
index 68b10647b9789ae6d4909a2cf4818a7cc78491e8..3997777562fb872bf8387c528913f27792449857 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 = &led_power_green;
                led-failsafe = &led_power_red;

diff --git a/target/linux/ath79/dts/qca9563_nec_wg800hp.dts b/target/linux/ath79/dts/qca9563_nec_wg800hp.dts
index 2efedcffec66012b0b8bd3efc9712d76cb6a25c5..09df26621e2636d42651611c625e62db6eeb203d 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 = &led_power_green;
                led-failsafe = &led_power_red;

diff --git a/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi b/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi
index 29b422536f36d9925ac3e091a7e64f482e4eaa83..2c0b0b0d71cd326715f272f01fece0a50e4e230b 100644 (file)
--- a/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi
+++ b/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi
@@ -6,10 +6,6 @@
 #include "qca956x.dtsi"
 
 / {
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &led_power_amber;
                led-failsafe = &led_power_amber;

diff --git a/target/linux/ath79/dts/qca9563_phicomm_k2t.dts b/target/linux/ath79/dts/qca9563_phicomm_k2t.dts
index a6aa3a8ad3caf584ca7c98a39d394f1a6499fc48..f12d0c997393518db85fbd38f33606315d1f3e6e 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 = &led_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 028324410fbe5cb840e00a2b9e565504e4653499..6a06f8904b9ccfca1e014a66a651ba4b537f1493 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 = &led_system;
                led-failsafe = &led_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 7852bed1f3994a7e5dcca397cc308b531bb075c8..6b40de25462040bf51a0c56e2974412682186a6d 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 = &led_system;
                led-failsafe = &led_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 dcdd7bcf3c26e014f11801b772c6fc9a55842308..4b45fa6da6b0e9d3e4b67dcae56f9a721463d7e7 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 = &led_system;
                led-failsafe = &led_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 367f826b9d61e839bca13501ff4fda0ed5b8d88c..8d28b088d2cb5a7a1e591b8a4f9cfb0b8425b5b2 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_archer-x6-v2.dtsi
+++ b/target/linux/ath79/dts/qca9563_tplink_archer-x6-v2.dtsi
@@ -9,10 +9,6 @@
        aliases {
                label-mac-device = &eth0;
        };
-
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
 };
 
 &pcie {

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 8d6e1ed9f98240ce19f33fa08c1c7fe932e8f558..f5daf98ca64e3c14eee3a62acaea9ef363b73f2d 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi
+++ b/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi
@@ -6,10 +6,6 @@
 #include "qca956x.dtsi"
 
 / {
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                led-boot = &led_system;
                led-failsafe = &led_system;

diff --git a/target/linux/ath79/dts/qca9563_tplink_re450.dtsi b/target/linux/ath79/dts/qca9563_tplink_re450.dtsi
index 6c894a314ea140c5337454ac704843a79dc98107..9fc30decaf3b7a1313ab3c4eb7c10b3d83278781 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_re450.dtsi
+++ b/target/linux/ath79/dts/qca9563_tplink_re450.dtsi
@@ -6,10 +6,6 @@
 #include "qca956x.dtsi"
 
 / {
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
                label-mac-device = &eth0;
                led-boot = &led_power;

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

diff --git a/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi b/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi
index bfad3ff306ec7eada0d68d259d314cfaaf6fe31d..574baae30486e34dd3ab8f4608f9804a63f34c8c 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 bd6b24209b8098a032233349491fdf9d156fa855..657ed3100395d3c6be1fc75f97dd79ede5ed6f14 100644 (file)
--- a/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi
+++ b/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi
@@ -10,10 +10,6 @@
                label-mac-device = &eth0;
        };
 
-       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 333428443f0a0032e5233dfd9bf057677a43ca0a..081e29e78f754551fe0593f166526a2205e56a56 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 d98250b070475754c871f6959b83007a63f491b6..94fd95c5d87e120a7134e169a40d0a760a4e07d5 100644 (file)
--- a/target/linux/ath79/dts/tp9343_tplink_tl-wx.dtsi
+++ b/target/linux/ath79/dts/tp9343_tplink_tl-wx.dtsi
@@ -9,10 +9,6 @@
        aliases {
                label-mac-device = &wmac;
        };
-
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
 };
 
 &spi {