[LEDE-DEV] [PATCH] lantiq: fix console print
Hauke Mehrtens
hauke at hauke-m.de
Wed Jan 4 14:11:26 PST 2017
The boot loader of many boards provides a kernel boot argument with a
broken console parameter to the kernel. This will be taken before the
stdout-path defined in device tree and the serial will not work on this
board. Multiple boards are affected by this problem, so revert this
patch for all boards. Later we can remove the boot arguments from the
device tree again, after the individual board was checked to work.
This partly reverts this commit:
commit 4995c64857a09c4cc92238ba0bd52cdb06c4c581
Author: Martin Blumenstingl <martin.blumenstingl at googlemail.com>
Date: Sun Dec 11 21:55:00 2016 +0100
lantiq: specify console using stdout-path instead of cmdline argument
Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
target/linux/lantiq/dts/ACMP252.dts | 4 ++++
target/linux/lantiq/dts/ARV4510PW.dts | 4 ++++
target/linux/lantiq/dts/ARV4518PWR01.dtsi | 4 ++++
target/linux/lantiq/dts/ARV4519PW.dts | 4 ++++
target/linux/lantiq/dts/ARV4520PW.dts | 4 ++++
target/linux/lantiq/dts/ARV452CQW.dts | 4 ++++
target/linux/lantiq/dts/ARV7510PW22.dts | 4 ++++
target/linux/lantiq/dts/ARV7518PW.dts | 4 ++++
target/linux/lantiq/dts/ARV7519PW.dts | 4 ++++
target/linux/lantiq/dts/ARV7519RW22.dts | 4 ++++
target/linux/lantiq/dts/ARV7525PW.dts | 4 ++++
target/linux/lantiq/dts/ARV752DPW.dts | 4 ++++
target/linux/lantiq/dts/ARV752DPW22.dts | 4 ++++
target/linux/lantiq/dts/BTHOMEHUBV2B.dts | 4 ++++
target/linux/lantiq/dts/BTHOMEHUBV3A.dts | 4 ++++
target/linux/lantiq/dts/BTHOMEHUBV5A.dts | 4 ++++
target/linux/lantiq/dts/DGN1000B.dts | 4 ++++
target/linux/lantiq/dts/DGN3500.dtsi | 2 +-
target/linux/lantiq/dts/EASY50712.dts | 4 ++++
target/linux/lantiq/dts/EASY50810.dts | 4 ++++
target/linux/lantiq/dts/EASY80920.dtsi | 4 ++++
target/linux/lantiq/dts/FRITZ3370.dts | 2 +-
target/linux/lantiq/dts/FRITZ7320.dts | 4 ++++
target/linux/lantiq/dts/FRITZ7360SL.dts | 4 ++++
target/linux/lantiq/dts/GIGASX76X.dts | 4 ++++
target/linux/lantiq/dts/H201L.dts | 4 ++++
target/linux/lantiq/dts/P2601HNFX.dts | 4 ++++
target/linux/lantiq/dts/P2812HNUFX.dtsi | 4 ++++
target/linux/lantiq/dts/TDW89X0.dtsi | 4 ++++
target/linux/lantiq/dts/VG3503J.dts | 4 ++++
target/linux/lantiq/dts/VGV7510KW22.dtsi | 2 +-
target/linux/lantiq/dts/VGV7519.dtsi | 2 +-
target/linux/lantiq/dts/VR200v.dts | 4 ++++
target/linux/lantiq/dts/WBMR.dts | 4 ++++
target/linux/lantiq/dts/WBMR300.dts | 4 ++++
35 files changed, 128 insertions(+), 4 deletions(-)
diff --git a/target/linux/lantiq/dts/ACMP252.dts b/target/linux/lantiq/dts/ACMP252.dts
index 50c011acaa..a94014b0f9 100644
--- a/target/linux/lantiq/dts/ACMP252.dts
+++ b/target/linux/lantiq/dts/ACMP252.dts
@@ -5,6 +5,10 @@
/ {
model = "ACMP252 - AudioCodes MediaPack MP-252";
+ chosen {
+ bootargs = "console=ttyLTQ0,115200";
+ };
+
memory at 0 {
reg = <0x0 0x4000000>;
};
diff --git a/target/linux/lantiq/dts/ARV4510PW.dts b/target/linux/lantiq/dts/ARV4510PW.dts
index 58507672a6..17609e25ba 100644
--- a/target/linux/lantiq/dts/ARV4510PW.dts
+++ b/target/linux/lantiq/dts/ARV4510PW.dts
@@ -7,6 +7,10 @@
/ {
model = "ARV4510PW - Wippies, Elisa";
+ chosen {
+ bootargs = "console=ttyLTQ0,115200";
+ };
+
aliases {
led-boot = &power;
led-failsafe = &power2;
diff --git a/target/linux/lantiq/dts/ARV4518PWR01.dtsi b/target/linux/lantiq/dts/ARV4518PWR01.dtsi
index c527147e91..8e712bfec6 100644
--- a/target/linux/lantiq/dts/ARV4518PWR01.dtsi
+++ b/target/linux/lantiq/dts/ARV4518PWR01.dtsi
@@ -3,6 +3,10 @@
#include <dt-bindings/input/input.h>
/ {
+ chosen {
+ bootargs = "console=ttyLTQ0,115200";
+ };
+
aliases {
led-boot = &power;
led-failsafe = &power;
diff --git a/target/linux/lantiq/dts/ARV4519PW.dts b/target/linux/lantiq/dts/ARV4519PW.dts
index fe0f9a7ac4..86c0d48763 100644
--- a/target/linux/lantiq/dts/ARV4519PW.dts
+++ b/target/linux/lantiq/dts/ARV4519PW.dts
@@ -7,6 +7,10 @@
/ {
model = "ARV4519PW - Vodafone Netfaster IAD 2, Pirelli P.RG A4201G";
+ chosen {
+ bootargs = "console=ttyLTQ0,115200";
+ };
+
aliases {
led-boot = &power_green;
led-failsafe = &power_red;
diff --git a/target/linux/lantiq/dts/ARV4520PW.dts b/target/linux/lantiq/dts/ARV4520PW.dts
index 2ad3a8a080..030e316c87 100644
--- a/target/linux/lantiq/dts/ARV4520PW.dts
+++ b/target/linux/lantiq/dts/ARV4520PW.dts
@@ -7,6 +7,10 @@
/ {
model = "ARV4520PW - Easybox 800, WAV-281";
+ chosen {
+ bootargs = "console=ttyLTQ0,115200";
+ };
+
aliases {
led-boot = &power_blue;
led-failsafe = &power_red;
diff --git a/target/linux/lantiq/dts/ARV452CQW.dts b/target/linux/lantiq/dts/ARV452CQW.dts
index 8d47b3b7db..6bc0796f9e 100644
--- a/target/linux/lantiq/dts/ARV452CQW.dts
+++ b/target/linux/lantiq/dts/ARV452CQW.dts
@@ -7,6 +7,10 @@
/ {
model = "ARV452CQW - Arcor 801";
+ chosen {
+ bootargs = "console=ttyLTQ0,115200";
+ };
+
aliases {
led-boot = &power_blue;
led-failsafe = &power_red;
diff --git a/target/linux/lantiq/dts/ARV7510PW22.dts b/target/linux/lantiq/dts/ARV7510PW22.dts
index d47567fe93..53ff3b7e94 100644
--- a/target/linux/lantiq/dts/ARV7510PW22.dts
+++ b/target/linux/lantiq/dts/ARV7510PW22.dts
@@ -7,6 +7,10 @@
/ {
model = "ARV7510PW22 - Astoria Networks";
+ chosen {
+ bootargs = "console=ttyLTQ0,115200";
+ };
+
aliases {
led-boot = &power;
led-failsafe = &power;
diff --git a/target/linux/lantiq/dts/ARV7518PW.dts b/target/linux/lantiq/dts/ARV7518PW.dts
index b7e2295b8c..a054437258 100644
--- a/target/linux/lantiq/dts/ARV7518PW.dts
+++ b/target/linux/lantiq/dts/ARV7518PW.dts
@@ -7,6 +7,10 @@
/ {
model = "ARV7518PW - Astoria Networks";
+ chosen {
+ bootargs = "console=ttyLTQ0,115200";
+ };
+
aliases {
led-boot = &power_green;
led-failsafe = &power_red;
diff --git a/target/linux/lantiq/dts/ARV7519PW.dts b/target/linux/lantiq/dts/ARV7519PW.dts
index baa1e26364..cc6786833f 100644
--- a/target/linux/lantiq/dts/ARV7519PW.dts
+++ b/target/linux/lantiq/dts/ARV7519PW.dts
@@ -7,6 +7,10 @@
/ {
model = "ARV7519PW - Astoria Networks";
+ chosen {
+ bootargs = "console=ttyLTQ0,115200";
+ };
+
aliases {
led-boot = &power;
led-failsafe = &power2;
diff --git a/target/linux/lantiq/dts/ARV7519RW22.dts b/target/linux/lantiq/dts/ARV7519RW22.dts
index 3cc91df948..14be6f2ca7 100644
--- a/target/linux/lantiq/dts/ARV7519RW22.dts
+++ b/target/linux/lantiq/dts/ARV7519RW22.dts
@@ -7,6 +7,10 @@
/ {
model = "ARV7519RW22 - Orange Livebox 2.1";
+ chosen {
+ bootargs = "console=ttyLTQ0,115200";
+ };
+
aliases {
led-boot = &power_green;
led-failsafe = &power_green;
diff --git a/target/linux/lantiq/dts/ARV7525PW.dts b/target/linux/lantiq/dts/ARV7525PW.dts
index 849a7b56be..7d643be2fd 100644
--- a/target/linux/lantiq/dts/ARV7525PW.dts
+++ b/target/linux/lantiq/dts/ARV7525PW.dts
@@ -7,6 +7,10 @@
/ {
model = "ARV7525PW - Speedport W303V Typ A";
+ chosen {
+ bootargs = "console=ttyLTQ0,115200";
+ };
+
aliases {
led-boot = &power_green;
led-failsafe = &power_red;
diff --git a/target/linux/lantiq/dts/ARV752DPW.dts b/target/linux/lantiq/dts/ARV752DPW.dts
index d6dc99bd48..b68a17cd1b 100644
--- a/target/linux/lantiq/dts/ARV752DPW.dts
+++ b/target/linux/lantiq/dts/ARV752DPW.dts
@@ -7,6 +7,10 @@
/ {
model = "ARV752DPW - Arcor 802";
+ chosen {
+ bootargs = "console=ttyLTQ0,115200";
+ };
+
aliases {
led-boot = &power_red;
led-failsafe = &power_blue;
diff --git a/target/linux/lantiq/dts/ARV752DPW22.dts b/target/linux/lantiq/dts/ARV752DPW22.dts
index 7636b1ba6f..225dfaaaac 100644
--- a/target/linux/lantiq/dts/ARV752DPW22.dts
+++ b/target/linux/lantiq/dts/ARV752DPW22.dts
@@ -7,6 +7,10 @@
/ {
model = "ARV752DPW22 - Arcor 803";
+ chosen {
+ bootargs = "console=ttyLTQ0,115200";
+ };
+
aliases {
led-boot = &power_red;
led-failsafe = &power_blue;
diff --git a/target/linux/lantiq/dts/BTHOMEHUBV2B.dts b/target/linux/lantiq/dts/BTHOMEHUBV2B.dts
index 69f4448bc1..751368bc74 100644
--- a/target/linux/lantiq/dts/BTHOMEHUBV2B.dts
+++ b/target/linux/lantiq/dts/BTHOMEHUBV2B.dts
@@ -7,6 +7,10 @@
/ {
model = "BTHOMEHUBV2B - BT Home Hub 2B"; /* SoC: Lantiq Danube-S PSB 50712 @ 333MHz V1.3/1.5 */
+ chosen {
+ bootargs = "console=ttyLTQ0,115200";
+ };
+
aliases {
led-boot = &power_orange;
led-failsafe = &power_red;
diff --git a/target/linux/lantiq/dts/BTHOMEHUBV3A.dts b/target/linux/lantiq/dts/BTHOMEHUBV3A.dts
index 2cd098905d..a909632022 100644
--- a/target/linux/lantiq/dts/BTHOMEHUBV3A.dts
+++ b/target/linux/lantiq/dts/BTHOMEHUBV3A.dts
@@ -7,6 +7,10 @@
/ {
model = "BTHOMEHUBV3A - BT Home Hub 3A"; /* SoC: Lantiq ar9 @ 333MHz */
+ chosen {
+ bootargs = "console=ttyLTQ0,115200";
+ };
+
aliases {
led-boot = &power_orange;
led-failsafe = &power_red;
diff --git a/target/linux/lantiq/dts/BTHOMEHUBV5A.dts b/target/linux/lantiq/dts/BTHOMEHUBV5A.dts
index 2d201ffa52..7f19e5291f 100644
--- a/target/linux/lantiq/dts/BTHOMEHUBV5A.dts
+++ b/target/linux/lantiq/dts/BTHOMEHUBV5A.dts
@@ -7,6 +7,10 @@
/ {
model = "BTHOMEHUBV5A - BT Home Hub 5A";
+ chosen {
+ bootargs = "console=ttyLTQ0,115200";
+ };
+
aliases {
led-boot = &power_green;
led-failsafe = &power_red;
diff --git a/target/linux/lantiq/dts/DGN1000B.dts b/target/linux/lantiq/dts/DGN1000B.dts
index 5999bdc310..558658292e 100644
--- a/target/linux/lantiq/dts/DGN1000B.dts
+++ b/target/linux/lantiq/dts/DGN1000B.dts
@@ -7,6 +7,10 @@
/ {
model = "DGN1000B - Netgear DGN1000B";
+ chosen {
+ bootargs = "console=ttyLTQ0,115200";
+ };
+
aliases {
led-boot = &power;
led-failsafe = &power;
diff --git a/target/linux/lantiq/dts/DGN3500.dtsi b/target/linux/lantiq/dts/DGN3500.dtsi
index 52cd895b48..5528d5994b 100644
--- a/target/linux/lantiq/dts/DGN3500.dtsi
+++ b/target/linux/lantiq/dts/DGN3500.dtsi
@@ -4,7 +4,7 @@
/ {
chosen {
- bootargs = "root=";
+ bootargs = "root= console=ttyLTQ0,115200";
};
aliases {
diff --git a/target/linux/lantiq/dts/EASY50712.dts b/target/linux/lantiq/dts/EASY50712.dts
index b1409b039b..ec3516ca8c 100644
--- a/target/linux/lantiq/dts/EASY50712.dts
+++ b/target/linux/lantiq/dts/EASY50712.dts
@@ -5,6 +5,10 @@
/ {
model = "EASY50712 - Intel EASY50712 Nand";
+ chosen {
+ bootargs = "console=ttyLTQ0,115200";
+ };
+
memory at 0 {
reg = <0x0 0x2000000>;
};
diff --git a/target/linux/lantiq/dts/EASY50810.dts b/target/linux/lantiq/dts/EASY50810.dts
index edba7a5d55..7c274a15a6 100644
--- a/target/linux/lantiq/dts/EASY50810.dts
+++ b/target/linux/lantiq/dts/EASY50810.dts
@@ -3,6 +3,10 @@
#include "ar9.dtsi"
/ {
+ chosen {
+ bootargs = "console=ttyLTQ0,115200";
+ };
+
memory at 0 {
reg = <0x0 0x2000000>;
};
diff --git a/target/linux/lantiq/dts/EASY80920.dtsi b/target/linux/lantiq/dts/EASY80920.dtsi
index 8e15ca89a2..aa646c8746 100644
--- a/target/linux/lantiq/dts/EASY80920.dtsi
+++ b/target/linux/lantiq/dts/EASY80920.dtsi
@@ -3,6 +3,10 @@
#include <dt-bindings/input/input.h>
/ {
+ chosen {
+ bootargs = "console=ttyLTQ0,115200";
+ };
+
aliases {
led-boot = &power;
led-failsafe = &power;
diff --git a/target/linux/lantiq/dts/FRITZ3370.dts b/target/linux/lantiq/dts/FRITZ3370.dts
index 1b4b28ca95..1e2e90ca1b 100644
--- a/target/linux/lantiq/dts/FRITZ3370.dts
+++ b/target/linux/lantiq/dts/FRITZ3370.dts
@@ -8,7 +8,7 @@
model = "FRITZ3370 - Fritz!Box WLAN 3370";
chosen {
- bootargs = "ubi.mtd=1,512 root=/dev/mtdblock9";
+ bootargs = "console=ttyLTQ0,115200 ubi.mtd=1,512 root=/dev/mtdblock9";
};
aliases {
diff --git a/target/linux/lantiq/dts/FRITZ7320.dts b/target/linux/lantiq/dts/FRITZ7320.dts
index e31981e3f4..1d3e02f9aa 100644
--- a/target/linux/lantiq/dts/FRITZ7320.dts
+++ b/target/linux/lantiq/dts/FRITZ7320.dts
@@ -7,6 +7,10 @@
/ {
model = "FRITZ7320 - 1&1 HomeServer";
+ chosen {
+ bootargs = "console=ttyLTQ0,115200";
+ };
+
aliases {
led-boot = &power;
led-failsafe = &power;
diff --git a/target/linux/lantiq/dts/FRITZ7360SL.dts b/target/linux/lantiq/dts/FRITZ7360SL.dts
index 8ecc8610ef..b4b12246ce 100644
--- a/target/linux/lantiq/dts/FRITZ7360SL.dts
+++ b/target/linux/lantiq/dts/FRITZ7360SL.dts
@@ -7,6 +7,10 @@
/ {
model = "FRITZ7360SL - 1&1 HomeServer";
+ chosen {
+ bootargs = "console=ttyLTQ0,115200";
+ };
+
aliases {
led-boot = &power_green;
led-failsafe = &power_red;
diff --git a/target/linux/lantiq/dts/GIGASX76X.dts b/target/linux/lantiq/dts/GIGASX76X.dts
index 43471b31b9..f5707e9c9b 100644
--- a/target/linux/lantiq/dts/GIGASX76X.dts
+++ b/target/linux/lantiq/dts/GIGASX76X.dts
@@ -7,6 +7,10 @@
/ {
model = "GIGASX76X - Gigaset SX761,SX762,SX763";
+ chosen {
+ bootargs = "console=ttyLTQ0,115200";
+ };
+
memory at 0 {
reg = <0x0 0x2000000>;
};
diff --git a/target/linux/lantiq/dts/H201L.dts b/target/linux/lantiq/dts/H201L.dts
index a080b27471..a24d7590e4 100644
--- a/target/linux/lantiq/dts/H201L.dts
+++ b/target/linux/lantiq/dts/H201L.dts
@@ -7,6 +7,10 @@
/ {
model = "H201L - ZTE H210L";
+ chosen {
+ bootargs = "console=ttyLTQ0,115200";
+ };
+
aliases {
led-boot = &power_green;
led-failsafe = &power_green;
diff --git a/target/linux/lantiq/dts/P2601HNFX.dts b/target/linux/lantiq/dts/P2601HNFX.dts
index d9f94602d7..7bfd52cf57 100644
--- a/target/linux/lantiq/dts/P2601HNFX.dts
+++ b/target/linux/lantiq/dts/P2601HNFX.dts
@@ -7,6 +7,10 @@
/ {
model = "P2601HNFX - ZyXEL P-2601HN-Fx";
+ chosen {
+ bootargs = "console=ttyLTQ0,115200";
+ };
+
aliases {
led-boot = &power_green;
led-failsafe = &power_red;
diff --git a/target/linux/lantiq/dts/P2812HNUFX.dtsi b/target/linux/lantiq/dts/P2812HNUFX.dtsi
index 14dcfd40bb..cc133f65ff 100644
--- a/target/linux/lantiq/dts/P2812HNUFX.dtsi
+++ b/target/linux/lantiq/dts/P2812HNUFX.dtsi
@@ -3,6 +3,10 @@
#include <dt-bindings/input/input.h>
/ {
+ chosen {
+ bootargs = "console=ttyLTQ0,115200";
+ };
+
aliases {
led-boot = &power_green;
led-failsafe = &power_red;
diff --git a/target/linux/lantiq/dts/TDW89X0.dtsi b/target/linux/lantiq/dts/TDW89X0.dtsi
index 96ade58a8a..4252297df7 100644
--- a/target/linux/lantiq/dts/TDW89X0.dtsi
+++ b/target/linux/lantiq/dts/TDW89X0.dtsi
@@ -3,6 +3,10 @@
#include <dt-bindings/input/input.h>
/ {
+ chosen {
+ bootargs = "console=ttyLTQ0,115200";
+ };
+
aliases {
/* the power led can't be controlled, use the wps led instead */
led-boot = &wps;
diff --git a/target/linux/lantiq/dts/VG3503J.dts b/target/linux/lantiq/dts/VG3503J.dts
index 9cbb9753d7..d2a6136d4f 100644
--- a/target/linux/lantiq/dts/VG3503J.dts
+++ b/target/linux/lantiq/dts/VG3503J.dts
@@ -7,6 +7,10 @@
/ {
model = "VG3503J - BT OpenReach VDSL Modem";
+ chosen {
+ bootargs = "console=ttyLTQ0,115200";
+ };
+
aliases {
led-boot = &power_green;
led-failsafe = &power_red;
diff --git a/target/linux/lantiq/dts/VGV7510KW22.dtsi b/target/linux/lantiq/dts/VGV7510KW22.dtsi
index e002c7daab..fa46e07670 100644
--- a/target/linux/lantiq/dts/VGV7510KW22.dtsi
+++ b/target/linux/lantiq/dts/VGV7510KW22.dtsi
@@ -4,7 +4,7 @@
/ {
chosen {
- bootargs = "mem=62M vpe1_load_addr=0x83e00000 vpe1_mem=2M maxvpes=1 maxtcs=1";
+ bootargs = "console=ttyLTQ0,115200 mem=62M vpe1_load_addr=0x83e00000 vpe1_mem=2M maxvpes=1 maxtcs=1";
};
aliases {
diff --git a/target/linux/lantiq/dts/VGV7519.dtsi b/target/linux/lantiq/dts/VGV7519.dtsi
index fbb5ec4b5e..9080d8d997 100644
--- a/target/linux/lantiq/dts/VGV7519.dtsi
+++ b/target/linux/lantiq/dts/VGV7519.dtsi
@@ -4,7 +4,7 @@
/ {
chosen {
- bootargs = "mem=62M vpe1_load_addr=0x83e00000 vpe1_mem=2M maxvpes=1 maxtcs=1";
+ bootargs = "console=ttyLTQ0,115200 mem=62M vpe1_load_addr=0x83e00000 vpe1_mem=2M maxvpes=1 maxtcs=1";
};
aliases {
diff --git a/target/linux/lantiq/dts/VR200v.dts b/target/linux/lantiq/dts/VR200v.dts
index 923a7d3c60..29d4279a6c 100644
--- a/target/linux/lantiq/dts/VR200v.dts
+++ b/target/linux/lantiq/dts/VR200v.dts
@@ -7,6 +7,10 @@
/ {
model = "VR200v - TP-LINK Archer VR200v";
+ chosen {
+ bootargs = "console=ttyLTQ0,115200";
+ };
+
aliases {
led-boot = &power;
led-failsafe = &power;
diff --git a/target/linux/lantiq/dts/WBMR.dts b/target/linux/lantiq/dts/WBMR.dts
index 24fbc557fc..79d7b63bff 100644
--- a/target/linux/lantiq/dts/WBMR.dts
+++ b/target/linux/lantiq/dts/WBMR.dts
@@ -7,6 +7,10 @@
/ {
model = "WBMR - Buffalo WBMR-HP-G300H";
+ chosen {
+ bootargs = "console=ttyLTQ0,115200";
+ };
+
aliases {
led-boot = &power_green;
led-failsafe = &power_red;
diff --git a/target/linux/lantiq/dts/WBMR300.dts b/target/linux/lantiq/dts/WBMR300.dts
index c0c5b7c013..d89e8a19db 100644
--- a/target/linux/lantiq/dts/WBMR300.dts
+++ b/target/linux/lantiq/dts/WBMR300.dts
@@ -7,6 +7,10 @@
/ {
model = "WBMR300 - Buffalo WBMR-300HPD";
+ chosen {
+ bootargs = "console=ttyLTQ0,115200";
+ };
+
aliases {
led-boot = &power_g;
led-failsafe = &diag_r;
--
2.11.0
More information about the Lede-dev
mailing list