[openwrt/openwrt] ramips: drop redundant chosen/bootargs
LEDE Commits
lede-commits at lists.infradead.org
Thu Jun 25 16:34:04 EDT 2020
adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/54b19e213aba6ec140614901f098593f7e395a47
commit 54b19e213aba6ec140614901f098593f7e395a47
Author: Adrian Schmutzler <freifunk at adrianschmutzler.de>
AuthorDate: Thu Jun 25 22:31:40 2020 +0200
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 <freifunk at adrianschmutzler.de>
---
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 ----
target/linux/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 6eab114fa5..6c603bd12f 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 977f0aa356..f4b3132fb9 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 966c47b465..f5ca7dc61d 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 4f2745286d..be83db2503 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 641b5ad7b1..092792fe40 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 54336ed1fe..f48cd8887b 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 1f255c76b2..0272df5ab8 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 add4e6d69e..7e16f097ef 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 ae085255b3..23a112d168 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 4a05264d7f..7c2ebf1b6b 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 a231985b9c..5cbfcf8986 100644
--- a/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts
+++ b/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts
@@ -6,7 +6,7 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
-/{
+/ {
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 21d804f77c..bf199f226c 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 e1e9479c81..a14f3cbef3 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 bee13a9683..35ef3cbf1a 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";
More information about the lede-commits
mailing list