From 6b94234a6598b855573a6516494de8e7d755e944 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Sun, 11 Dec 2016 21:55:01 +0100 Subject: 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 --- 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 | 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/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 ---- target/linux/lantiq/dts/danube.dtsi | 1 - 34 files changed, 2 insertions(+), 125 deletions(-) (limited to 'target') diff --git a/target/linux/lantiq/dts/ACMP252.dts b/target/linux/lantiq/dts/ACMP252.dts index cb1ec75..50c011a 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 3f10d66..5850767 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 6e92bf3..c527147 100644 --- a/target/linux/lantiq/dts/ARV4518PWR01.dtsi +++ b/target/linux/lantiq/dts/ARV4518PWR01.dtsi @@ -3,10 +3,6 @@ #include / { - 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 77a3f32..fe0f9a7 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 4fa8082..2ad3a8a 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 f2b8457..8d47b3b 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 63608dd..d47567f 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 523c535..b7e2295 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 580b1fa..baa1e26 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 82ce353..3cc91df 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 b12bd98..849a7b5 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 262124a..d6dc99b 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 16d8f1c..7636b1b 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 54dde32..69f4448 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 4fde8d6..2cd0989 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 150a8da..2d201ff 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 e6954cf..9484872 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 dcf529d..b1409b0 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 513bf5b..edba7a5 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 dc568fc..8e15ca8 100644 --- a/target/linux/lantiq/dts/EASY80920.dtsi +++ b/target/linux/lantiq/dts/EASY80920.dtsi @@ -3,10 +3,6 @@ #include / { - 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 b2657d6..e31981e 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 a750bd1..b3cb1c5 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 0709f6b..43471b3 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 4249005..a080b27 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 5454743..d9f9460 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 82dc324..14dcfd4 100644 --- a/target/linux/lantiq/dts/P2812HNUFX.dtsi +++ b/target/linux/lantiq/dts/P2812HNUFX.dtsi @@ -3,10 +3,6 @@ #include / { - 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 cf33847..96ade58 100644 --- a/target/linux/lantiq/dts/TDW89X0.dtsi +++ b/target/linux/lantiq/dts/TDW89X0.dtsi @@ -3,10 +3,6 @@ #include / { - 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 ff647e0..9cbb975 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 f24f471..e002c7d 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 2826dc2..fbb5ec4 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 a111cd8..923a7d3 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 d209de0..24fbc55 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 ece386a..c0c5b7c 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 37db512..f11787f 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"; }; -- cgit v1.1