[PATCH v3 1/5] realtek: Consolidate bootargs

Sander Vanheule sander at svanheule.net
Sat Nov 6 07:52:46 PDT 2021


All current devices use identical bootargs, so let's move that to the
common devicetree includes.

At the same time, also add the equivalent value for /chosen/stdout-path
and add earlycon to the bootargs, in line with upstream DTS.

Signed-off-by: Sander Vanheule <sander at svanheule.net>

--
v2:
- Add stdout-path node, and earlycon to bootargs
---
 target/linux/realtek/dts-5.10/rtl8380_netgear_gigabit.dtsi    | 4 ----
 target/linux/realtek/dts-5.10/rtl8380_zyxel_gs1900.dtsi       | 4 ----
 target/linux/realtek/dts-5.10/rtl8382_allnet_all-sg8208m.dts  | 4 ----
 target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210-10p.dts | 4 ----
 target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210.dtsi    | 4 ----
 target/linux/realtek/dts-5.10/rtl8382_inaba_aml2-17gp.dts     | 4 ----
 target/linux/realtek/dts-5.10/rtl838x.dtsi                    | 3 ++-
 target/linux/realtek/dts-5.10/rtl930x.dtsi                    | 3 ++-
 8 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/target/linux/realtek/dts-5.10/rtl8380_netgear_gigabit.dtsi b/target/linux/realtek/dts-5.10/rtl8380_netgear_gigabit.dtsi
index e98a9bfc615b..6eb316231b47 100644
--- a/target/linux/realtek/dts-5.10/rtl8380_netgear_gigabit.dtsi
+++ b/target/linux/realtek/dts-5.10/rtl8380_netgear_gigabit.dtsi
@@ -8,10 +8,6 @@
 / {
 	compatible = "realtek,rtl838x-soc";
 
-	chosen {
-		bootargs = "console=ttyS0,115200";
-	};
-
 	memory at 0 {
 		device_type = "memory";
 		reg = <0x0 0x8000000>;
diff --git a/target/linux/realtek/dts-5.10/rtl8380_zyxel_gs1900.dtsi b/target/linux/realtek/dts-5.10/rtl8380_zyxel_gs1900.dtsi
index 7233f6086c6f..7095006454a9 100644
--- a/target/linux/realtek/dts-5.10/rtl8380_zyxel_gs1900.dtsi
+++ b/target/linux/realtek/dts-5.10/rtl8380_zyxel_gs1900.dtsi
@@ -13,10 +13,6 @@
 		led-upgrade = &led_sys;
 	};
 
-	chosen {
-		bootargs = "console=ttyS0,115200";
-	};
-
 	memory at 0 {
 		device_type = "memory";
 		reg = <0x0 0x8000000>;
diff --git a/target/linux/realtek/dts-5.10/rtl8382_allnet_all-sg8208m.dts b/target/linux/realtek/dts-5.10/rtl8382_allnet_all-sg8208m.dts
index f4ca1686dd08..320cb08ac7de 100644
--- a/target/linux/realtek/dts-5.10/rtl8382_allnet_all-sg8208m.dts
+++ b/target/linux/realtek/dts-5.10/rtl8382_allnet_all-sg8208m.dts
@@ -16,10 +16,6 @@
 		led-upgrade = &led_sys;
 	};
 
-	chosen {
-		bootargs = "console=ttyS0,115200";
-	};
-
 	memory at 0 {
 		device_type = "memory";
 		reg = <0x0 0x8000000>;
diff --git a/target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210-10p.dts b/target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210-10p.dts
index 119eaadc16e6..a0f377c4f4a7 100644
--- a/target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210-10p.dts
+++ b/target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210-10p.dts
@@ -16,10 +16,6 @@
 		led-upgrade = &led_power;
 	};
 
-	chosen {
-		bootargs = "console=ttyS0,115200";
-	};
-
 	memory at 0 {
 		device_type = "memory";
 		reg = <0x0 0x8000000>;
diff --git a/target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210.dtsi b/target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210.dtsi
index a4811dbf3073..312a36c1a844 100644
--- a/target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210.dtsi
+++ b/target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210.dtsi
@@ -13,10 +13,6 @@
 		led-upgrade = &led_power;
 	};
 
-	chosen {
-		bootargs = "console=ttyS0,115200";
-	};
-
 	memory at 0 {
 		device_type = "memory";
 		reg = <0x0 0x8000000>;
diff --git a/target/linux/realtek/dts-5.10/rtl8382_inaba_aml2-17gp.dts b/target/linux/realtek/dts-5.10/rtl8382_inaba_aml2-17gp.dts
index 1dc9e272fe3f..30960afff4d9 100644
--- a/target/linux/realtek/dts-5.10/rtl8382_inaba_aml2-17gp.dts
+++ b/target/linux/realtek/dts-5.10/rtl8382_inaba_aml2-17gp.dts
@@ -9,10 +9,6 @@
 	compatible = "inaba,aml2-17gp", "realtek,rtl838x-soc";
 	model = "INABA Abaniact AML2-17GP";
 
-	chosen {
-		bootargs = "console=ttyS0,115200";
-	};
-
 	memory at 0 {
 		device_type = "memory";
 		reg = <0x0 0x8000000>;
diff --git a/target/linux/realtek/dts-5.10/rtl838x.dtsi b/target/linux/realtek/dts-5.10/rtl838x.dtsi
index a72addcf369d..52e9fe67b757 100644
--- a/target/linux/realtek/dts-5.10/rtl838x.dtsi
+++ b/target/linux/realtek/dts-5.10/rtl838x.dtsi
@@ -65,7 +65,8 @@
 	};
 
 	chosen {
-		bootargs = "console=ttyS0,38400";
+		stdout-path = "uart0:115200";
+		bootargs = "earlycon console=ttyS0,115200";
 	};
 
 	cpuintc: cpuintc {
diff --git a/target/linux/realtek/dts-5.10/rtl930x.dtsi b/target/linux/realtek/dts-5.10/rtl930x.dtsi
index e78e9ebeb8fd..6207865f5b7e 100644
--- a/target/linux/realtek/dts-5.10/rtl930x.dtsi
+++ b/target/linux/realtek/dts-5.10/rtl930x.dtsi
@@ -70,7 +70,8 @@
 	};
 
 	chosen {
-		bootargs = "console=ttyS0,38400";
+		stdout-path = "uart0:115200";
+		bootargs = "earlycon console=ttyS0,115200";
 	};
 
 	cpuintc: cpuintc {
-- 
2.33.1




More information about the openwrt-devel mailing list