From d8dde8c5178eba8c847dd48e7d06e6663ba1979f Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Wed, 4 Jan 2017 21:53:22 +0100 Subject: [PATCH] lantiq: fix console print 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 Date: Sun Dec 11 21:55:00 2016 +0100 lantiq: specify console using stdout-path instead of cmdline argument Signed-off-by: Hauke Mehrtens --- 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 50c011acaae6..a94014b0f982 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@0 { reg = <0x0 0x4000000>; }; diff --git a/target/linux/lantiq/dts/ARV4510PW.dts b/target/linux/lantiq/dts/ARV4510PW.dts index 58507672a609..17609e25ba69 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 c527147e91d8..8e712bfec6e6 100644 --- a/target/linux/lantiq/dts/ARV4518PWR01.dtsi +++ b/target/linux/lantiq/dts/ARV4518PWR01.dtsi @@ -3,6 +3,10 @@ #include / { + 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 fe0f9a7ac41c..86c0d4876348 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 2ad3a8a0803c..030e316c8709 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 8d47b3b7db2d..6bc0796f9e76 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 d47567fe9326..53ff3b7e945b 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 b7e2295b8ce9..a05443725810 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 baa1e263645c..cc6786833fd0 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 3cc91df948b7..14be6f2ca713 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 849a7b56be93..7d643be2fd7a 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 d6dc99bd488c..b68a17cd1b18 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 7636b1ba6f30..225dfaaaacc3 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 69f4448bc151..751368bc74e3 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 2cd098905da9..a9096320228f 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 2d201ffa5235..7f19e5291ff4 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 5999bdc310d9..558658292e9d 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 52cd895b48c2..5528d5994b8f 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 b1409b039b69..ec3516ca8cc9 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@0 { reg = <0x0 0x2000000>; }; diff --git a/target/linux/lantiq/dts/EASY50810.dts b/target/linux/lantiq/dts/EASY50810.dts index edba7a5d554e..7c274a15a658 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@0 { reg = <0x0 0x2000000>; }; diff --git a/target/linux/lantiq/dts/EASY80920.dtsi b/target/linux/lantiq/dts/EASY80920.dtsi index 8e15ca89a22f..aa646c8746c1 100644 --- a/target/linux/lantiq/dts/EASY80920.dtsi +++ b/target/linux/lantiq/dts/EASY80920.dtsi @@ -3,6 +3,10 @@ #include / { + 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 1b4b28ca95ce..1e2e90ca1b46 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 e31981e3f448..1d3e02f9aafb 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 8ecc8610ef02..b4b12246ced6 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 43471b31b93d..f5707e9c9b94 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@0 { reg = <0x0 0x2000000>; }; diff --git a/target/linux/lantiq/dts/H201L.dts b/target/linux/lantiq/dts/H201L.dts index a080b2747119..a24d7590e4a9 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 d9f94602d75a..7bfd52cf571c 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 14dcfd40bb95..cc133f65ff17 100644 --- a/target/linux/lantiq/dts/P2812HNUFX.dtsi +++ b/target/linux/lantiq/dts/P2812HNUFX.dtsi @@ -3,6 +3,10 @@ #include / { + 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 96ade58a8afd..4252297df766 100644 --- a/target/linux/lantiq/dts/TDW89X0.dtsi +++ b/target/linux/lantiq/dts/TDW89X0.dtsi @@ -3,6 +3,10 @@ #include / { + 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 9cbb9753d706..d2a6136d4fdf 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 e002c7daabe2..fa46e0767077 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 fbb5ec4b5e2d..9080d8d99780 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 923a7d3c6046..29d4279a6cca 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 24fbc557fc11..79d7b63bffd7 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 c0c5b7c013b9..d89e8a19dbb5 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.30.2