From: Martin Blumenstingl Date: Sun, 11 Dec 2016 20:55:00 +0000 (+0100) Subject: lantiq: specify console using stdout-path instead of cmdline argument X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4995c64857a09c4cc92238ba0bd52cdb06c4c581;p=openwrt%2Fstaging%2Fluka.git lantiq: specify console using stdout-path instead of cmdline argument Use devicetree's /chosen/stdout-path instead of the kernel command line (embedded in the .dts-files) to specify the serial console. Using the chosen node is recommended on devicetree based platforms. Signed-off-by: Martin Blumenstingl --- diff --git a/target/linux/lantiq/dts/ACMP252.dts b/target/linux/lantiq/dts/ACMP252.dts index 3961bf4dcc..cb1ec759c2 100644 --- a/target/linux/lantiq/dts/ACMP252.dts +++ b/target/linux/lantiq/dts/ACMP252.dts @@ -6,7 +6,7 @@ model = "ACMP252 - AudioCodes MediaPack MP-252"; chosen { - bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + bootargs = "init=/etc/preinit"; }; memory@0 { diff --git a/target/linux/lantiq/dts/ARV4510PW.dts b/target/linux/lantiq/dts/ARV4510PW.dts index c34ffe81d9..3f10d66edf 100644 --- a/target/linux/lantiq/dts/ARV4510PW.dts +++ b/target/linux/lantiq/dts/ARV4510PW.dts @@ -8,7 +8,7 @@ model = "ARV4510PW - Wippies, Elisa"; chosen { - bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + bootargs = "init=/etc/preinit"; }; aliases { diff --git a/target/linux/lantiq/dts/ARV4518PWR01.dtsi b/target/linux/lantiq/dts/ARV4518PWR01.dtsi index 84c3c4aff5..6e92bf38ae 100644 --- a/target/linux/lantiq/dts/ARV4518PWR01.dtsi +++ b/target/linux/lantiq/dts/ARV4518PWR01.dtsi @@ -4,7 +4,7 @@ / { chosen { - bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + bootargs = "init=/etc/preinit"; }; aliases { diff --git a/target/linux/lantiq/dts/ARV4519PW.dts b/target/linux/lantiq/dts/ARV4519PW.dts index 77d466d826..77a3f32bd4 100644 --- a/target/linux/lantiq/dts/ARV4519PW.dts +++ b/target/linux/lantiq/dts/ARV4519PW.dts @@ -8,7 +8,7 @@ model = "ARV4519PW - Vodafone Netfaster IAD 2, Pirelli P.RG A4201G"; chosen { - bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + bootargs = "init=/etc/preinit"; }; aliases { diff --git a/target/linux/lantiq/dts/ARV4520PW.dts b/target/linux/lantiq/dts/ARV4520PW.dts index 0466968e6f..4fa8082323 100644 --- a/target/linux/lantiq/dts/ARV4520PW.dts +++ b/target/linux/lantiq/dts/ARV4520PW.dts @@ -8,7 +8,7 @@ model = "ARV4520PW - Easybox 800, WAV-281"; chosen { - bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + bootargs = "init=/etc/preinit"; }; aliases { diff --git a/target/linux/lantiq/dts/ARV452CQW.dts b/target/linux/lantiq/dts/ARV452CQW.dts index 21c5604fbf..f2b84579c6 100644 --- a/target/linux/lantiq/dts/ARV452CQW.dts +++ b/target/linux/lantiq/dts/ARV452CQW.dts @@ -8,7 +8,7 @@ model = "ARV452CQW - Arcor 801"; chosen { - bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + bootargs = "init=/etc/preinit"; }; aliases { diff --git a/target/linux/lantiq/dts/ARV7510PW22.dts b/target/linux/lantiq/dts/ARV7510PW22.dts index 47ab55e273..63608ddf49 100644 --- a/target/linux/lantiq/dts/ARV7510PW22.dts +++ b/target/linux/lantiq/dts/ARV7510PW22.dts @@ -8,7 +8,7 @@ model = "ARV7510PW22 - Astoria Networks"; chosen { - bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + bootargs = "init=/etc/preinit"; }; aliases { diff --git a/target/linux/lantiq/dts/ARV7518PW.dts b/target/linux/lantiq/dts/ARV7518PW.dts index 3b5d38d719..523c535e6f 100644 --- a/target/linux/lantiq/dts/ARV7518PW.dts +++ b/target/linux/lantiq/dts/ARV7518PW.dts @@ -8,7 +8,7 @@ model = "ARV7518PW - Astoria Networks"; chosen { - bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + bootargs = "init=/etc/preinit"; }; aliases { diff --git a/target/linux/lantiq/dts/ARV7519PW.dts b/target/linux/lantiq/dts/ARV7519PW.dts index ea9b0dab00..580b1fae07 100644 --- a/target/linux/lantiq/dts/ARV7519PW.dts +++ b/target/linux/lantiq/dts/ARV7519PW.dts @@ -8,7 +8,7 @@ model = "ARV7519PW - Astoria Networks"; chosen { - bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + bootargs = "init=/etc/preinit"; }; aliases { diff --git a/target/linux/lantiq/dts/ARV7519RW22.dts b/target/linux/lantiq/dts/ARV7519RW22.dts index c25a3b5d5e..82ce3533a5 100644 --- a/target/linux/lantiq/dts/ARV7519RW22.dts +++ b/target/linux/lantiq/dts/ARV7519RW22.dts @@ -8,7 +8,7 @@ model = "ARV7519RW22 - Orange Livebox 2.1"; chosen { - bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + bootargs = "init=/etc/preinit"; }; aliases { diff --git a/target/linux/lantiq/dts/ARV7525PW.dts b/target/linux/lantiq/dts/ARV7525PW.dts index be498e4d1e..b12bd980b6 100644 --- a/target/linux/lantiq/dts/ARV7525PW.dts +++ b/target/linux/lantiq/dts/ARV7525PW.dts @@ -8,7 +8,7 @@ model = "ARV7525PW - Speedport W303V Typ A"; chosen { - bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + bootargs = "init=/etc/preinit"; }; aliases { diff --git a/target/linux/lantiq/dts/ARV752DPW.dts b/target/linux/lantiq/dts/ARV752DPW.dts index 0fa5684feb..262124a0b0 100644 --- a/target/linux/lantiq/dts/ARV752DPW.dts +++ b/target/linux/lantiq/dts/ARV752DPW.dts @@ -8,7 +8,7 @@ model = "ARV752DPW - Arcor 802"; chosen { - bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + bootargs = "init=/etc/preinit"; }; aliases { diff --git a/target/linux/lantiq/dts/ARV752DPW22.dts b/target/linux/lantiq/dts/ARV752DPW22.dts index c409fcb1ea..16d8f1c3f4 100644 --- a/target/linux/lantiq/dts/ARV752DPW22.dts +++ b/target/linux/lantiq/dts/ARV752DPW22.dts @@ -8,7 +8,7 @@ model = "ARV752DPW22 - Arcor 803"; chosen { - bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + bootargs = "init=/etc/preinit"; }; aliases { diff --git a/target/linux/lantiq/dts/BTHOMEHUBV2B.dts b/target/linux/lantiq/dts/BTHOMEHUBV2B.dts index 948267d121..54dde32b2a 100644 --- a/target/linux/lantiq/dts/BTHOMEHUBV2B.dts +++ b/target/linux/lantiq/dts/BTHOMEHUBV2B.dts @@ -8,7 +8,7 @@ model = "BTHOMEHUBV2B - BT Home Hub 2B"; /* SoC: Lantiq Danube-S PSB 50712 @ 333MHz V1.3/1.5 */ chosen { - bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + bootargs = "init=/etc/preinit"; }; aliases { diff --git a/target/linux/lantiq/dts/BTHOMEHUBV3A.dts b/target/linux/lantiq/dts/BTHOMEHUBV3A.dts index 600334feb5..4fde8d6a5e 100644 --- a/target/linux/lantiq/dts/BTHOMEHUBV3A.dts +++ b/target/linux/lantiq/dts/BTHOMEHUBV3A.dts @@ -8,7 +8,7 @@ model = "BTHOMEHUBV3A - BT Home Hub 3A"; /* SoC: Lantiq ar9 @ 333MHz */ chosen { - bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + bootargs = "init=/etc/preinit"; }; aliases { diff --git a/target/linux/lantiq/dts/BTHOMEHUBV5A.dts b/target/linux/lantiq/dts/BTHOMEHUBV5A.dts index df55456f0c..150a8da6aa 100644 --- a/target/linux/lantiq/dts/BTHOMEHUBV5A.dts +++ b/target/linux/lantiq/dts/BTHOMEHUBV5A.dts @@ -8,7 +8,7 @@ model = "BTHOMEHUBV5A - BT Home Hub 5A"; chosen { - bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + bootargs = "init=/etc/preinit"; }; aliases { diff --git a/target/linux/lantiq/dts/DGN1000B.dts b/target/linux/lantiq/dts/DGN1000B.dts index e15a4e25ce..e6954cf582 100644 --- a/target/linux/lantiq/dts/DGN1000B.dts +++ b/target/linux/lantiq/dts/DGN1000B.dts @@ -8,7 +8,7 @@ model = "DGN1000B - Netgear DGN1000B"; chosen { - bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + bootargs = "init=/etc/preinit"; aliases { led-boot = &power; diff --git a/target/linux/lantiq/dts/DGN3500.dtsi b/target/linux/lantiq/dts/DGN3500.dtsi index 5528d5994b..52cd895b48 100644 --- a/target/linux/lantiq/dts/DGN3500.dtsi +++ b/target/linux/lantiq/dts/DGN3500.dtsi @@ -4,7 +4,7 @@ / { chosen { - bootargs = "root= console=ttyLTQ0,115200"; + bootargs = "root="; }; aliases { diff --git a/target/linux/lantiq/dts/EASY50712.dts b/target/linux/lantiq/dts/EASY50712.dts index 9afcb75e38..dcf529d26a 100644 --- a/target/linux/lantiq/dts/EASY50712.dts +++ b/target/linux/lantiq/dts/EASY50712.dts @@ -6,7 +6,7 @@ model = "EASY50712 - Intel EASY50712 Nand"; chosen { - bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + bootargs = "init=/etc/preinit"; }; memory@0 { diff --git a/target/linux/lantiq/dts/EASY50810.dts b/target/linux/lantiq/dts/EASY50810.dts index 44e08cac98..513bf5bbb8 100644 --- a/target/linux/lantiq/dts/EASY50810.dts +++ b/target/linux/lantiq/dts/EASY50810.dts @@ -4,7 +4,7 @@ / { chosen { - bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + bootargs = "init=/etc/preinit"; }; memory@0 { diff --git a/target/linux/lantiq/dts/EASY80920.dtsi b/target/linux/lantiq/dts/EASY80920.dtsi index 051db9a217..dc568fc497 100644 --- a/target/linux/lantiq/dts/EASY80920.dtsi +++ b/target/linux/lantiq/dts/EASY80920.dtsi @@ -4,7 +4,7 @@ / { chosen { - bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + bootargs = "init=/etc/preinit"; }; aliases { diff --git a/target/linux/lantiq/dts/FRITZ3370.dts b/target/linux/lantiq/dts/FRITZ3370.dts index 1e2e90ca1b..1b4b28ca95 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 = "console=ttyLTQ0,115200 ubi.mtd=1,512 root=/dev/mtdblock9"; + bootargs = "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 4eb5fc4fe3..b2657d6569 100644 --- a/target/linux/lantiq/dts/FRITZ7320.dts +++ b/target/linux/lantiq/dts/FRITZ7320.dts @@ -8,7 +8,7 @@ model = "FRITZ7320 - 1&1 HomeServer"; chosen { - bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + bootargs = "init=/etc/preinit"; }; aliases { diff --git a/target/linux/lantiq/dts/FRITZ7360SL.dts b/target/linux/lantiq/dts/FRITZ7360SL.dts index e54b0e27ab..a750bd1849 100644 --- a/target/linux/lantiq/dts/FRITZ7360SL.dts +++ b/target/linux/lantiq/dts/FRITZ7360SL.dts @@ -8,7 +8,7 @@ model = "FRITZ7360SL - 1&1 HomeServer"; chosen { - bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + bootargs = "init=/etc/preinit"; }; aliases { diff --git a/target/linux/lantiq/dts/GIGASX76X.dts b/target/linux/lantiq/dts/GIGASX76X.dts index 6602693b7c..0709f6b1b7 100644 --- a/target/linux/lantiq/dts/GIGASX76X.dts +++ b/target/linux/lantiq/dts/GIGASX76X.dts @@ -8,7 +8,7 @@ model = "GIGASX76X - Gigaset SX761,SX762,SX763"; chosen { - bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + bootargs = "init=/etc/preinit"; }; memory@0 { diff --git a/target/linux/lantiq/dts/H201L.dts b/target/linux/lantiq/dts/H201L.dts index 7d4a24c661..4249005008 100644 --- a/target/linux/lantiq/dts/H201L.dts +++ b/target/linux/lantiq/dts/H201L.dts @@ -8,7 +8,7 @@ model = "H201L - ZTE H210L"; chosen { - bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + bootargs = "init=/etc/preinit"; }; aliases { diff --git a/target/linux/lantiq/dts/P2601HNFX.dts b/target/linux/lantiq/dts/P2601HNFX.dts index c82ab3dcb8..54547431d8 100644 --- a/target/linux/lantiq/dts/P2601HNFX.dts +++ b/target/linux/lantiq/dts/P2601HNFX.dts @@ -8,7 +8,7 @@ model = "P2601HNFX - ZyXEL P-2601HN-Fx"; chosen { - bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + bootargs = "init=/etc/preinit"; }; aliases { diff --git a/target/linux/lantiq/dts/P2812HNUFX.dtsi b/target/linux/lantiq/dts/P2812HNUFX.dtsi index afd13eaf03..82dc324b75 100644 --- a/target/linux/lantiq/dts/P2812HNUFX.dtsi +++ b/target/linux/lantiq/dts/P2812HNUFX.dtsi @@ -4,7 +4,7 @@ / { chosen { - bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + bootargs = "init=/etc/preinit"; }; aliases { diff --git a/target/linux/lantiq/dts/TDW89X0.dtsi b/target/linux/lantiq/dts/TDW89X0.dtsi index 153d96eff8..cf33847b6c 100644 --- a/target/linux/lantiq/dts/TDW89X0.dtsi +++ b/target/linux/lantiq/dts/TDW89X0.dtsi @@ -4,7 +4,7 @@ / { chosen { - bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + bootargs = "init=/etc/preinit"; }; aliases { diff --git a/target/linux/lantiq/dts/VG3503J.dts b/target/linux/lantiq/dts/VG3503J.dts index db25b87488..ff647e0710 100644 --- a/target/linux/lantiq/dts/VG3503J.dts +++ b/target/linux/lantiq/dts/VG3503J.dts @@ -8,7 +8,7 @@ model = "VG3503J - BT OpenReach VDSL Modem"; chosen { - bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + bootargs = "init=/etc/preinit"; }; aliases { diff --git a/target/linux/lantiq/dts/VGV7510KW22.dtsi b/target/linux/lantiq/dts/VGV7510KW22.dtsi index bab7a2df02..f24f471ce3 100644 --- a/target/linux/lantiq/dts/VGV7510KW22.dtsi +++ b/target/linux/lantiq/dts/VGV7510KW22.dtsi @@ -4,7 +4,7 @@ / { chosen { - bootargs = "console=ttyLTQ0,115200 init=/etc/preinit mem=62M vpe1_load_addr=0x83e00000 vpe1_mem=2M maxvpes=1 maxtcs=1"; + bootargs = "init=/etc/preinit 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 9875e2143f..2826dc2c47 100644 --- a/target/linux/lantiq/dts/VGV7519.dtsi +++ b/target/linux/lantiq/dts/VGV7519.dtsi @@ -4,7 +4,7 @@ / { chosen { - bootargs = "console=ttyLTQ0,115200 init=/etc/preinit mem=62M vpe1_load_addr=0x83e00000 vpe1_mem=2M maxvpes=1 maxtcs=1"; + bootargs = "init=/etc/preinit 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 42a36438bf..a111cd840d 100644 --- a/target/linux/lantiq/dts/VR200v.dts +++ b/target/linux/lantiq/dts/VR200v.dts @@ -8,7 +8,7 @@ model = "VR200v - TP-LINK Archer VR200v"; chosen { - bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + bootargs = "init=/etc/preinit"; }; aliases { diff --git a/target/linux/lantiq/dts/WBMR.dts b/target/linux/lantiq/dts/WBMR.dts index 7ae0cb7474..d209de093d 100644 --- a/target/linux/lantiq/dts/WBMR.dts +++ b/target/linux/lantiq/dts/WBMR.dts @@ -8,7 +8,7 @@ model = "WBMR - Buffalo WBMR-HP-G300H"; chosen { - bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + bootargs = "init=/etc/preinit"; }; aliases { diff --git a/target/linux/lantiq/dts/WBMR300.dts b/target/linux/lantiq/dts/WBMR300.dts index 3058152f1b..ece386ae77 100644 --- a/target/linux/lantiq/dts/WBMR300.dts +++ b/target/linux/lantiq/dts/WBMR300.dts @@ -8,7 +8,7 @@ model = "WBMR300 - Buffalo WBMR-300HPD"; chosen { - bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + bootargs = "init=/etc/preinit"; }; aliases { diff --git a/target/linux/lantiq/dts/amazonse.dtsi b/target/linux/lantiq/dts/amazonse.dtsi index 33a5a35339..bce618fed8 100644 --- a/target/linux/lantiq/dts/amazonse.dtsi +++ b/target/linux/lantiq/dts/amazonse.dtsi @@ -5,6 +5,14 @@ #size-cells = <1>; compatible = "lantiq,xway", "lantiq,ase"; + aliases { + serial0 = &asc1; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + cpus { cpu@0 { compatible = "mips,mips4Kc"; @@ -100,7 +108,7 @@ reg = <0xE100B10 0xA0>; }; - serial@E100C00 { + asc1: serial@E100C00 { compatible = "lantiq,asc"; reg = <0xE100C00 0x400>; interrupt-parent = <&icu0>; diff --git a/target/linux/lantiq/dts/ar9.dtsi b/target/linux/lantiq/dts/ar9.dtsi index 4d3fd6f9a3..569f25f02c 100644 --- a/target/linux/lantiq/dts/ar9.dtsi +++ b/target/linux/lantiq/dts/ar9.dtsi @@ -5,6 +5,14 @@ #size-cells = <1>; compatible = "lantiq,xway", "lantiq,ar9"; + aliases { + serial0 = &asc1; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + cpus { cpu@0 { compatible = "mips,mips34K"; diff --git a/target/linux/lantiq/dts/danube.dtsi b/target/linux/lantiq/dts/danube.dtsi index af691df2f8..37db512454 100644 --- a/target/linux/lantiq/dts/danube.dtsi +++ b/target/linux/lantiq/dts/danube.dtsi @@ -5,8 +5,13 @@ #size-cells = <1>; compatible = "lantiq,xway", "lantiq,danube"; + aliases { + serial0 = &asc1; + }; + chosen { - bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; + bootargs = "init=/etc/preinit"; + stdout-path = "serial0:115200n8"; }; cpus { diff --git a/target/linux/lantiq/dts/falcon.dtsi b/target/linux/lantiq/dts/falcon.dtsi index 76dde61760..30025e0dc2 100644 --- a/target/linux/lantiq/dts/falcon.dtsi +++ b/target/linux/lantiq/dts/falcon.dtsi @@ -19,6 +19,10 @@ gpio4 = &gpio4; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + clocks { compatible = "simple-bus"; diff --git a/target/linux/lantiq/dts/vr9.dtsi b/target/linux/lantiq/dts/vr9.dtsi index 7f036186e4..4810a91c5c 100644 --- a/target/linux/lantiq/dts/vr9.dtsi +++ b/target/linux/lantiq/dts/vr9.dtsi @@ -5,6 +5,14 @@ #size-cells = <1>; compatible = "lantiq,xway", "lantiq,vr9"; + aliases { + serial0 = &asc1; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + cpus { cpu@0 { compatible = "mips,mips34Kc";