From 635f111148c3f7ccb0ecc92863a3b1a142f6ebeb Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Thu, 25 Jun 2020 23:09:05 +0200 Subject: [PATCH] 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 --- target/linux/ath79/dts/ar7100.dtsi | 4 ++++ target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi | 4 ---- target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dts | 4 ---- target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts | 4 ---- target/linux/ath79/dts/ar7161_netgear_wndr.dtsi | 4 ---- target/linux/ath79/dts/ar7161_siemens_ws-ap3610.dts | 4 ---- target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi | 4 ---- target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi | 4 ---- target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts | 4 ---- target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts | 4 ---- target/linux/ath79/dts/qca9531_yuncore_a770.dts | 4 ---- target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi | 4 ---- target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi | 4 ---- target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts | 4 ---- target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi | 4 ---- target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi | 4 ---- target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi | 4 ---- target/linux/ath79/dts/qca9556_avm_fritz-repeater.dtsi | 4 ---- .../dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts | 4 ---- target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts | 4 ---- target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi | 4 ---- target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi | 4 ---- target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi | 4 ---- target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts | 4 ---- target/linux/ath79/dts/qca9558_domywifi_dw33d.dts | 4 ---- target/linux/ath79/dts/qca9558_engenius_ecb1750.dts | 4 ---- target/linux/ath79/dts/qca9558_engenius_epg5000.dts | 4 ---- .../linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts | 4 ---- .../dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts | 4 ---- target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi | 4 ---- target/linux/ath79/dts/qca9558_ocedo_koala.dts | 4 ---- target/linux/ath79/dts/qca9558_ocedo_ursus.dts | 4 ---- target/linux/ath79/dts/qca9558_sitecom_wlr-8100.dts | 4 ---- target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi | 4 ---- target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi | 4 ---- target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts | 4 ---- target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi | 4 ---- target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts | 4 ---- target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi | 4 ---- target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts | 4 ---- target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts | 4 ---- target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts | 4 ---- target/linux/ath79/dts/qca955x.dtsi | 4 ++++ target/linux/ath79/dts/qca955x_ubnt_xc.dtsi | 6 ------ target/linux/ath79/dts/qca9561_avm_fritz4020.dts | 4 ---- target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts | 4 ---- target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi | 4 ---- target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi | 4 ---- target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts | 4 ---- target/linux/ath79/dts/qca9563_dlink_dir-842-c.dtsi | 4 ---- target/linux/ath79/dts/qca9563_dlink_dir-859-a1.dts | 4 ---- target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi | 4 ---- target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi | 4 ---- target/linux/ath79/dts/qca9563_nec_wg1200cr.dts | 4 ---- target/linux/ath79/dts/qca9563_nec_wg800hp.dts | 4 ---- target/linux/ath79/dts/qca9563_netgear_wndr.dtsi | 4 ---- target/linux/ath79/dts/qca9563_phicomm_k2t.dts | 4 ---- target/linux/ath79/dts/qca9563_rosinson_wr818.dts | 4 ---- target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts | 4 ---- target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts | 4 ---- target/linux/ath79/dts/qca9563_tplink_archer-x6-v2.dtsi | 4 ---- target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi | 4 ---- target/linux/ath79/dts/qca9563_tplink_re450.dtsi | 4 ---- target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi | 4 ---- target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi | 4 ---- target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi | 4 ---- target/linux/ath79/dts/qca956x.dtsi | 4 ++++ target/linux/ath79/dts/tp9343_tplink_tl-wx.dtsi | 4 ---- 68 files changed, 12 insertions(+), 262 deletions(-) diff --git a/target/linux/ath79/dts/ar7100.dtsi b/target/linux/ath79/dts/ar7100.dtsi index e3f0edccff4..fe88cfab2d2 100644 --- 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 e957a51e27b..58753b6d4a5 100644 --- 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 b3855eff06d..43f35683bdf 100644 --- 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 5e35dddd4b5..bb6c31da9e7 100644 --- 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 f1db1ffd588..87c619aa036 100644 --- 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 = ð0; }; - 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 8e0a80cb328..5ebfb4c872c 100644 --- 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 fc5d8335b55..cf4095379b7 100644 --- 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 9d9af23bab7..82d232d444c 100644 --- 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 130944f4f5c..3aa6bd1367b 100644 --- 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 4f5a29cfa01..0e338fe012b 100644 --- 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 1caae75f1d4..21283d98dfa 100644 --- 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 e0505e57247..fb805ff66ab 100644 --- 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 546a87a9b65..19d101f8cc4 100644 --- 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 52369120473..f2e2dee04f1 100644 --- 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 f89d020672c..df920c842f3 100644 --- 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 3559481f7d3..ade5dec7185 100644 --- 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 b24ed1fb14a..fcfd82702cd 100644 --- 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 13e0b3371a6..9d189953950 100644 --- 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 feae550039c..c5c51b68796 100644 --- 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 7f6c6b5889b..d7380bac38e 100644 --- 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 2b199bfa489..78ee3a39db6 100644 --- 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 e2a71c0ce65..1a93a023afa 100644 --- 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 fc15dd44163..208d6e3580f 100644 --- 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 4ae9ee2b47f..2c17ab8b611 100644 --- 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 5e6e44be749..876e3d118c8 100644 --- 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 15286b76704..a1efcaffe13 100644 --- 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 94daefbb791..eccd3a968dc 100644 --- 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 ef00d1807be..8a55abd244e 100644 --- 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 391c034dab7..a3f42f87bfe 100644 --- 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 19b6d5c8cbc..c15c5c023b3 100644 --- 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 b3934a90d49..ff4230c3b5b 100644 --- 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 d629f5b6baf..a97e36aad36 100644 --- 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 98f2789564a..ba3a338912f 100644 --- 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 1a550137dd7..1f3d0b8d7b6 100644 --- 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 aab8eac7ce8..2d636717008 100644 --- 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 8e79e126171..887b6eea5f5 100644 --- 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 2dde5585cd3..618f0d434b0 100644 --- 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 0003bd19247..70fcfd35245 100644 --- 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 8a39a10ba59..aca5745ff30 100644 --- 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 fb60631a3cc..bcd9e4d18b7 100644 --- 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 fb7d5fe40c8..e23a5991b18 100644 --- 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 ac4a70fbde3..ade9159fcf8 100644 --- 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 5bcaccaa14b..ff8ac70d73c 100644 --- 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 bd8ebaf0405..b27a9c2fe8a 100644 --- 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 75cc5761ba7..7c13c3e4700 100644 --- 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 e7b30df81f0..7078da479ea 100644 --- 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 c8e4710b39a..4d1eb641602 100644 --- 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 = ð1; }; - 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 b1b166d89a6..993c6acc56b 100644 --- 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 e4c737b8ffd..5f1748f9367 100644 --- 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 6b2fb1c4a0c..5e2c614dfc3 100644 --- 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 8502bed4c52..b9e413a2652 100644 --- 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 9395c7b26f8..8df752a2ecb 100644 --- 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 8a00029c658..6111b968a28 100644 --- 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 68b10647b97..3997777562f 100644 --- 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 2efedcffec6..09df26621e2 100644 --- 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 29b422536f3..2c0b0b0d71c 100644 --- 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 a6aa3a8ad3c..f12d0c99739 100644 --- 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 028324410fb..6a06f8904b9 100644 --- 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 7852bed1f39..6b40de25462 100644 --- 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 dcdd7bcf3c2..4b45fa6da6b 100644 --- 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 367f826b9d6..8d28b088d2c 100644 --- 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 = ð0; }; - - 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 8d6e1ed9f98..f5daf98ca64 100644 --- 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 6c894a314ea..9fc30decaf3 100644 --- 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 = ð0; 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 47480481fa1..eab19fe1f27 100644 --- 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 bfad3ff306e..574baae3048 100644 --- 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 bd6b24209b8..657ed310039 100644 --- 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 = ð0; }; - 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 333428443f0..081e29e78f7 100644 --- 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 d98250b0704..94fd95c5d87 100644 --- 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 { -- 2.47.2