From 54b19e213aba6ec140614901f098593f7e395a47 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Thu, 25 Jun 2020 22:31:40 +0200 Subject: [PATCH] ramips: drop redundant chosen/bootargs chosen/bootargs are defined to the same value in device DTS files that is already set in the SoC DTSI. Remove the redundant definitions. Signed-off-by: Adrian Schmutzler --- target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts | 4 ---- target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts | 4 ---- target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts | 4 ---- target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi | 4 ---- target/linux/ramips/dts/mt7620a_lb-link_bl-w1200.dts | 4 ---- .../ramips/dts/mt7620a_netgear_ex2700_wn3000rp-v3.dtsi | 4 ---- target/linux/ramips/dts/mt7620a_netgear_ex3x00_ex61xx.dtsi | 4 ---- target/linux/ramips/dts/mt7628an_asus_rt-n1x.dtsi | 4 ---- target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts | 4 ---- target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts | 4 ---- target/linux/ramips/dts/mt7628an_skylab_skw92a.dts | 6 +----- target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts | 4 ---- target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts | 4 ---- target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts | 4 ---- 14 files changed, 1 insertion(+), 57 deletions(-) diff --git a/target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts b/target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts index 6eab114fa5b..6c603bd12f9 100644 --- a/target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts +++ b/target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts @@ -9,10 +9,6 @@ compatible = "dovado,tiny-ac", "ralink,mt7620a-soc"; model = "Dovado Tiny AC"; - chosen { - bootargs = "console=ttyS0,57600"; - }; - leds { compatible = "gpio-leds"; diff --git a/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts b/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts index 977f0aa356b..f4b3132fb91 100644 --- a/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts +++ b/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts @@ -29,10 +29,6 @@ led-upgrade = &led_power; }; - chosen { - bootargs = "console=ttyS0,57600"; - }; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts b/target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts index 966c47b465b..f5ca7dc61dc 100644 --- a/target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts +++ b/target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts @@ -17,10 +17,6 @@ led-upgrade = &led_power; }; - chosen { - bootargs = "console=ttyS0,57600"; - }; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi b/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi index 4f2745286de..be83db25038 100644 --- a/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi +++ b/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi @@ -15,10 +15,6 @@ led-upgrade = &led_power; }; - chosen { - bootargs = "console=ttyS0,57600"; - }; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ramips/dts/mt7620a_lb-link_bl-w1200.dts b/target/linux/ramips/dts/mt7620a_lb-link_bl-w1200.dts index 641b5ad7b1b..092792fe408 100644 --- a/target/linux/ramips/dts/mt7620a_lb-link_bl-w1200.dts +++ b/target/linux/ramips/dts/mt7620a_lb-link_bl-w1200.dts @@ -17,10 +17,6 @@ led-upgrade = &led_wps; }; - chosen { - bootargs = "console=ttyS0,57600"; - }; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ramips/dts/mt7620a_netgear_ex2700_wn3000rp-v3.dtsi b/target/linux/ramips/dts/mt7620a_netgear_ex2700_wn3000rp-v3.dtsi index 54336ed1fe7..f48cd8887b2 100644 --- a/target/linux/ramips/dts/mt7620a_netgear_ex2700_wn3000rp-v3.dtsi +++ b/target/linux/ramips/dts/mt7620a_netgear_ex2700_wn3000rp-v3.dtsi @@ -4,10 +4,6 @@ #include "mt7620a.dtsi" / { - chosen { - bootargs = "console=ttyS0,57600"; - }; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ramips/dts/mt7620a_netgear_ex3x00_ex61xx.dtsi b/target/linux/ramips/dts/mt7620a_netgear_ex3x00_ex61xx.dtsi index 1f255c76b2b..0272df5ab8b 100644 --- a/target/linux/ramips/dts/mt7620a_netgear_ex3x00_ex61xx.dtsi +++ b/target/linux/ramips/dts/mt7620a_netgear_ex3x00_ex61xx.dtsi @@ -4,10 +4,6 @@ #include "mt7620a.dtsi" / { - chosen { - bootargs = "console=ttyS0,57600"; - }; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ramips/dts/mt7628an_asus_rt-n1x.dtsi b/target/linux/ramips/dts/mt7628an_asus_rt-n1x.dtsi index add4e6d69e0..7e16f097ef1 100644 --- a/target/linux/ramips/dts/mt7628an_asus_rt-n1x.dtsi +++ b/target/linux/ramips/dts/mt7628an_asus_rt-n1x.dtsi @@ -13,10 +13,6 @@ led-upgrade = &led_power; }; - chosen { - bootargs = "console=ttyS0,57600"; - }; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts b/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts index ae085255b3c..23a112d1685 100644 --- a/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts +++ b/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts @@ -10,10 +10,6 @@ compatible = "hilink,hlk-7628n", "mediatek,mt7628an-soc"; model = "HILINK HLK-7628N"; - chosen { - bootargs = "console=ttyS0,57600"; - }; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts b/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts index 4a05264d7f2..7c2ebf1b6b8 100644 --- a/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts +++ b/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts @@ -16,10 +16,6 @@ led-upgrade = &led_status; }; - chosen { - bootargs = "console=ttyS0,57600"; - }; - leds { compatible = "gpio-leds"; diff --git a/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts b/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts index a231985b9c0..5cbfcf89862 100644 --- a/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts +++ b/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts @@ -6,7 +6,7 @@ #include #include -/{ +/ { compatible = "skylab,skw92a", "mediatek,mt7628an-soc"; model = "SKYLAB SKW92A"; @@ -15,10 +15,6 @@ led-failsafe = &led_power; }; - chosen { - bootargs = "console=ttyS0,57600"; - }; - leds { compatible = "gpio-leds"; diff --git a/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts b/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts index 21d804f77cf..bf199f226c5 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts @@ -18,10 +18,6 @@ label-mac-device = ðernet; }; - chosen { - bootargs = "console=ttyS0,57600"; - }; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts index e1e9479c815..a14f3cbef37 100644 --- a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts +++ b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts @@ -8,10 +8,6 @@ compatible = "wavlink,wl-wn570ha1", "mediatek,mt7628an-soc"; model = "Wavlink WL-WN570HA1"; - chosen { - bootargs = "console=ttyS0,57600"; - }; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts index bee13a9683a..35ef3cbf1a0 100644 --- a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts +++ b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts @@ -8,10 +8,6 @@ compatible = "wavlink,wl-wn575a3", "mediatek,mt7628an-soc"; model = "Wavlink WL-WN575A3"; - chosen { - bootargs = "console=ttyS0,57600"; - }; - keys { compatible = "gpio-keys"; -- 2.30.2