diff options
author | Martin Blumenstingl <martin.blumenstingl@googlemail.com> | 2016-12-11 21:55:01 +0100 |
---|---|---|
committer | John Crispin <john@phrozen.org> | 2016-12-12 09:57:40 +0100 |
commit | 6b94234a6598b855573a6516494de8e7d755e944 (patch) | |
tree | cc3cd09c211b2482c6b38e8be25d534f8b199968 | |
parent | 4995c64857a09c4cc92238ba0bd52cdb06c4c581 (diff) | |
download | upstream-6b94234a6598b855573a6516494de8e7d755e944.tar.gz upstream-6b94234a6598b855573a6516494de8e7d755e944.tar.bz2 upstream-6b94234a6598b855573a6516494de8e7d755e944.zip |
lantiq: remove "init" kernel command line parameter from bootargs
/etc/preinit has been the default init-script for a very long time (at
least since Linux 2.6.30 in OpenWrt). Remove the kernel command line
"init" parameter to get rid of duplicate and inconsistent definitions
of this parameter (some boards, like FRITZ3370 for example did not use
it at all, while it's just copy and paste on others).
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
34 files changed, 2 insertions, 125 deletions
diff --git a/target/linux/lantiq/dts/ACMP252.dts b/target/linux/lantiq/dts/ACMP252.dts index cb1ec759c2..50c011acaa 100644 --- a/target/linux/lantiq/dts/ACMP252.dts +++ b/target/linux/lantiq/dts/ACMP252.dts @@ -5,10 +5,6 @@ / { model = "ACMP252 - AudioCodes MediaPack MP-252"; - chosen { - bootargs = "init=/etc/preinit"; - }; - memory@0 { reg = <0x0 0x4000000>; }; diff --git a/target/linux/lantiq/dts/ARV4510PW.dts b/target/linux/lantiq/dts/ARV4510PW.dts index 3f10d66edf..58507672a6 100644 --- a/target/linux/lantiq/dts/ARV4510PW.dts +++ b/target/linux/lantiq/dts/ARV4510PW.dts @@ -7,10 +7,6 @@ / { model = "ARV4510PW - Wippies, Elisa"; - chosen { - bootargs = "init=/etc/preinit"; - }; - aliases { led-boot = &power; led-failsafe = &power2; diff --git a/target/linux/lantiq/dts/ARV4518PWR01.dtsi b/target/linux/lantiq/dts/ARV4518PWR01.dtsi index 6e92bf38ae..c527147e91 100644 --- a/target/linux/lantiq/dts/ARV4518PWR01.dtsi +++ b/target/linux/lantiq/dts/ARV4518PWR01.dtsi @@ -3,10 +3,6 @@ #include <dt-bindings/input/input.h> / { - chosen { - bootargs = "init=/etc/preinit"; - }; - aliases { led-boot = &power; led-failsafe = &power; diff --git a/target/linux/lantiq/dts/ARV4519PW.dts b/target/linux/lantiq/dts/ARV4519PW.dts index 77a3f32bd4..fe0f9a7ac4 100644 --- a/target/linux/lantiq/dts/ARV4519PW.dts +++ b/target/linux/lantiq/dts/ARV4519PW.dts @@ -7,10 +7,6 @@ / { model = "ARV4519PW - Vodafone Netfaster IAD 2, Pirelli P.RG A4201G"; - chosen { - bootargs = "init=/etc/preinit"; - }; - 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 4fa8082323..2ad3a8a080 100644 --- a/target/linux/lantiq/dts/ARV4520PW.dts +++ b/target/linux/lantiq/dts/ARV4520PW.dts @@ -7,10 +7,6 @@ / { model = "ARV4520PW - Easybox 800, WAV-281"; - chosen { - bootargs = "init=/etc/preinit"; - }; - 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 f2b84579c6..8d47b3b7db 100644 --- a/target/linux/lantiq/dts/ARV452CQW.dts +++ b/target/linux/lantiq/dts/ARV452CQW.dts @@ -7,10 +7,6 @@ / { model = "ARV452CQW - Arcor 801"; - chosen { - bootargs = "init=/etc/preinit"; - }; - 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 63608ddf49..d47567fe93 100644 --- a/target/linux/lantiq/dts/ARV7510PW22.dts +++ b/target/linux/lantiq/dts/ARV7510PW22.dts @@ -7,10 +7,6 @@ / { model = "ARV7510PW22 - Astoria Networks"; - chosen { - bootargs = "init=/etc/preinit"; - }; - aliases { led-boot = &power; led-failsafe = &power; diff --git a/target/linux/lantiq/dts/ARV7518PW.dts b/target/linux/lantiq/dts/ARV7518PW.dts index 523c535e6f..b7e2295b8c 100644 --- a/target/linux/lantiq/dts/ARV7518PW.dts +++ b/target/linux/lantiq/dts/ARV7518PW.dts @@ -7,10 +7,6 @@ / { model = "ARV7518PW - Astoria Networks"; - chosen { - bootargs = "init=/etc/preinit"; - }; - 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 580b1fae07..baa1e26364 100644 --- a/target/linux/lantiq/dts/ARV7519PW.dts +++ b/target/linux/lantiq/dts/ARV7519PW.dts @@ -7,10 +7,6 @@ / { model = "ARV7519PW - Astoria Networks"; - chosen { - bootargs = "init=/etc/preinit"; - }; - aliases { led-boot = &power; led-failsafe = &power2; diff --git a/target/linux/lantiq/dts/ARV7519RW22.dts b/target/linux/lantiq/dts/ARV7519RW22.dts index 82ce3533a5..3cc91df948 100644 --- a/target/linux/lantiq/dts/ARV7519RW22.dts +++ b/target/linux/lantiq/dts/ARV7519RW22.dts @@ -7,10 +7,6 @@ / { model = "ARV7519RW22 - Orange Livebox 2.1"; - chosen { - bootargs = "init=/etc/preinit"; - }; - 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 b12bd980b6..849a7b56be 100644 --- a/target/linux/lantiq/dts/ARV7525PW.dts +++ b/target/linux/lantiq/dts/ARV7525PW.dts @@ -7,10 +7,6 @@ / { model = "ARV7525PW - Speedport W303V Typ A"; - chosen { - bootargs = "init=/etc/preinit"; - }; - 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 262124a0b0..d6dc99bd48 100644 --- a/target/linux/lantiq/dts/ARV752DPW.dts +++ b/target/linux/lantiq/dts/ARV752DPW.dts @@ -7,10 +7,6 @@ / { model = "ARV752DPW - Arcor 802"; - chosen { - bootargs = "init=/etc/preinit"; - }; - 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 16d8f1c3f4..7636b1ba6f 100644 --- a/target/linux/lantiq/dts/ARV752DPW22.dts +++ b/target/linux/lantiq/dts/ARV752DPW22.dts @@ -7,10 +7,6 @@ / { model = "ARV752DPW22 - Arcor 803"; - chosen { - bootargs = "init=/etc/preinit"; - }; - 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 54dde32b2a..69f4448bc1 100644 --- a/target/linux/lantiq/dts/BTHOMEHUBV2B.dts +++ b/target/linux/lantiq/dts/BTHOMEHUBV2B.dts @@ -7,10 +7,6 @@ / { model = "BTHOMEHUBV2B - BT Home Hub 2B"; /* SoC: Lantiq Danube-S PSB 50712 @ 333MHz V1.3/1.5 */ - chosen { - bootargs = "init=/etc/preinit"; - }; - 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 4fde8d6a5e..2cd098905d 100644 --- a/target/linux/lantiq/dts/BTHOMEHUBV3A.dts +++ b/target/linux/lantiq/dts/BTHOMEHUBV3A.dts @@ -7,10 +7,6 @@ / { model = "BTHOMEHUBV3A - BT Home Hub 3A"; /* SoC: Lantiq ar9 @ 333MHz */ - chosen { - bootargs = "init=/etc/preinit"; - }; - 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 150a8da6aa..2d201ffa52 100644 --- a/target/linux/lantiq/dts/BTHOMEHUBV5A.dts +++ b/target/linux/lantiq/dts/BTHOMEHUBV5A.dts @@ -7,10 +7,6 @@ / { model = "BTHOMEHUBV5A - BT Home Hub 5A"; - chosen { - bootargs = "init=/etc/preinit"; - }; - 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 e6954cf582..9484872448 100644 --- a/target/linux/lantiq/dts/DGN1000B.dts +++ b/target/linux/lantiq/dts/DGN1000B.dts @@ -8,8 +8,6 @@ model = "DGN1000B - Netgear DGN1000B"; chosen { - bootargs = "init=/etc/preinit"; - aliases { led-boot = &power; led-failsafe = &power; diff --git a/target/linux/lantiq/dts/EASY50712.dts b/target/linux/lantiq/dts/EASY50712.dts index dcf529d26a..b1409b039b 100644 --- a/target/linux/lantiq/dts/EASY50712.dts +++ b/target/linux/lantiq/dts/EASY50712.dts @@ -5,10 +5,6 @@ / { model = "EASY50712 - Intel EASY50712 Nand"; - chosen { - bootargs = "init=/etc/preinit"; - }; - memory@0 { reg = <0x0 0x2000000>; }; diff --git a/target/linux/lantiq/dts/EASY50810.dts b/target/linux/lantiq/dts/EASY50810.dts index 513bf5bbb8..edba7a5d55 100644 --- a/target/linux/lantiq/dts/EASY50810.dts +++ b/target/linux/lantiq/dts/EASY50810.dts @@ -3,10 +3,6 @@ #include "ar9.dtsi" / { - chosen { - bootargs = "init=/etc/preinit"; - }; - memory@0 { reg = <0x0 0x2000000>; }; diff --git a/target/linux/lantiq/dts/EASY80920.dtsi b/target/linux/lantiq/dts/EASY80920.dtsi index dc568fc497..8e15ca89a2 100644 --- a/target/linux/lantiq/dts/EASY80920.dtsi +++ b/target/linux/lantiq/dts/EASY80920.dtsi @@ -3,10 +3,6 @@ #include <dt-bindings/input/input.h> / { - chosen { - bootargs = "init=/etc/preinit"; - }; - aliases { led-boot = &power; led-failsafe = &power; diff --git a/target/linux/lantiq/dts/FRITZ7320.dts b/target/linux/lantiq/dts/FRITZ7320.dts index b2657d6569..e31981e3f4 100644 --- a/target/linux/lantiq/dts/FRITZ7320.dts +++ b/target/linux/lantiq/dts/FRITZ7320.dts @@ -7,10 +7,6 @@ / { model = "FRITZ7320 - 1&1 HomeServer"; - chosen { - bootargs = "init=/etc/preinit"; - }; - aliases { led-boot = &power; led-failsafe = &power; diff --git a/target/linux/lantiq/dts/FRITZ7360SL.dts b/target/linux/lantiq/dts/FRITZ7360SL.dts index a750bd1849..b3cb1c5241 100644 --- a/target/linux/lantiq/dts/FRITZ7360SL.dts +++ b/target/linux/lantiq/dts/FRITZ7360SL.dts @@ -7,10 +7,6 @@ / { model = "FRITZ7360SL - 1&1 HomeServer"; - chosen { - bootargs = "init=/etc/preinit"; - }; - 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 0709f6b1b7..43471b31b9 100644 --- a/target/linux/lantiq/dts/GIGASX76X.dts +++ b/target/linux/lantiq/dts/GIGASX76X.dts @@ -7,10 +7,6 @@ / { model = "GIGASX76X - Gigaset SX761,SX762,SX763"; - chosen { - bootargs = "init=/etc/preinit"; - }; - memory@0 { reg = <0x0 0x2000000>; }; diff --git a/target/linux/lantiq/dts/H201L.dts b/target/linux/lantiq/dts/H201L.dts index 4249005008..a080b27471 100644 --- a/target/linux/lantiq/dts/H201L.dts +++ b/target/linux/lantiq/dts/H201L.dts @@ -7,10 +7,6 @@ / { model = "H201L - ZTE H210L"; - chosen { - bootargs = "init=/etc/preinit"; - }; - 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 54547431d8..d9f94602d7 100644 --- a/target/linux/lantiq/dts/P2601HNFX.dts +++ b/target/linux/lantiq/dts/P2601HNFX.dts @@ -7,10 +7,6 @@ / { model = "P2601HNFX - ZyXEL P-2601HN-Fx"; - chosen { - bootargs = "init=/etc/preinit"; - }; - 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 82dc324b75..14dcfd40bb 100644 --- a/target/linux/lantiq/dts/P2812HNUFX.dtsi +++ b/target/linux/lantiq/dts/P2812HNUFX.dtsi @@ -3,10 +3,6 @@ #include <dt-bindings/input/input.h> / { - chosen { - bootargs = "init=/etc/preinit"; - }; - 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 cf33847b6c..96ade58a8a 100644 --- a/target/linux/lantiq/dts/TDW89X0.dtsi +++ b/target/linux/lantiq/dts/TDW89X0.dtsi @@ -3,10 +3,6 @@ #include <dt-bindings/input/input.h> / { - chosen { - bootargs = "init=/etc/preinit"; - }; - 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 ff647e0710..9cbb9753d7 100644 --- a/target/linux/lantiq/dts/VG3503J.dts +++ b/target/linux/lantiq/dts/VG3503J.dts @@ -7,10 +7,6 @@ / { model = "VG3503J - BT OpenReach VDSL Modem"; - chosen { - bootargs = "init=/etc/preinit"; - }; - 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 f24f471ce3..e002c7daab 100644 --- a/target/linux/lantiq/dts/VGV7510KW22.dtsi +++ b/target/linux/lantiq/dts/VGV7510KW22.dtsi @@ -4,7 +4,7 @@ / { chosen { - bootargs = "init=/etc/preinit mem=62M vpe1_load_addr=0x83e00000 vpe1_mem=2M maxvpes=1 maxtcs=1"; + bootargs = "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 2826dc2c47..fbb5ec4b5e 100644 --- a/target/linux/lantiq/dts/VGV7519.dtsi +++ b/target/linux/lantiq/dts/VGV7519.dtsi @@ -4,7 +4,7 @@ / { chosen { - bootargs = "init=/etc/preinit mem=62M vpe1_load_addr=0x83e00000 vpe1_mem=2M maxvpes=1 maxtcs=1"; + bootargs = "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 a111cd840d..923a7d3c60 100644 --- a/target/linux/lantiq/dts/VR200v.dts +++ b/target/linux/lantiq/dts/VR200v.dts @@ -7,10 +7,6 @@ / { model = "VR200v - TP-LINK Archer VR200v"; - chosen { - bootargs = "init=/etc/preinit"; - }; - aliases { led-boot = &power; led-failsafe = &power; diff --git a/target/linux/lantiq/dts/WBMR.dts b/target/linux/lantiq/dts/WBMR.dts index d209de093d..24fbc557fc 100644 --- a/target/linux/lantiq/dts/WBMR.dts +++ b/target/linux/lantiq/dts/WBMR.dts @@ -7,10 +7,6 @@ / { model = "WBMR - Buffalo WBMR-HP-G300H"; - chosen { - bootargs = "init=/etc/preinit"; - }; - 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 ece386ae77..c0c5b7c013 100644 --- a/target/linux/lantiq/dts/WBMR300.dts +++ b/target/linux/lantiq/dts/WBMR300.dts @@ -7,10 +7,6 @@ / { model = "WBMR300 - Buffalo WBMR-300HPD"; - chosen { - bootargs = "init=/etc/preinit"; - }; - aliases { led-boot = &power_g; led-failsafe = &diag_r; diff --git a/target/linux/lantiq/dts/danube.dtsi b/target/linux/lantiq/dts/danube.dtsi index 37db512454..f11787f975 100644 --- a/target/linux/lantiq/dts/danube.dtsi +++ b/target/linux/lantiq/dts/danube.dtsi @@ -10,7 +10,6 @@ }; chosen { - bootargs = "init=/etc/preinit"; stdout-path = "serial0:115200n8"; }; |