brcm63xx: move the bootargs into the dtb files

Instead of using a fixed commandline, allow one per device.

Signed-off-by: Jonas Gorski <[email protected]>

target/linux/brcm63xx/config-4.4

@@ -54,9 +54,6 @@ CONFIG_BOARD_LIVEBOX=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_CEVT_R4K=y
 CONFIG_CLONE_BACKWARDS=y
-CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
-CONFIG_CMDLINE_BOOL=y
-# CONFIG_CMDLINE_OVERRIDE is not set
 CONFIG_CPU_BIG_ENDIAN=y
 CONFIG_CPU_BMIPS=y
 CONFIG_CPU_BMIPS32_3300=y

target/linux/brcm63xx/dts/a226g.dts

@@ -8,6 +8,10 @@
 	model = "Pirelli A226G";
 	compatible = "pirelli,a226g", "brcm,bcm6358";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/a226m-fwb.dts

@@ -8,6 +8,10 @@
 	model = "Pirelli A226M-FWB";
 	compatible = "pirelli,a226m-fwb", "brcm,bcm6358";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/a226m.dts

@@ -8,6 +8,10 @@
 	model = "Pirelli A226M";
 	compatible = "pirelli,a226m", "brcm,bcm6358";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/a4001n.dts

@@ -8,6 +8,10 @@
 	model = "ADB P.DG A4001N";
 	compatible = "adb,a4001n", "brcm,bcm6328";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/a4001n1.dts

@@ -8,6 +8,10 @@
 	model = "ADB P.DG A4001N1";
 	compatible = "adb,a4001n1", "brcm,bcm6328";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/agpf-s0.dts

@@ -8,6 +8,10 @@
 	model = "Pirelli Alice Gate AGPF-S0";
 	compatible = "pirelli,agpf-s0", "brcm,bcm6358";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/ar-5381u.dts

@@ -8,6 +8,10 @@
 	model = "Comtrend AR-5381u";
 	compatible = "comtrend,ar-5381u", "brcm,bcm6328";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/ar-5387un.dts

@@ -8,6 +8,10 @@
 	model = "Comtrend AR-5387un";
 	compatible = "comtrend,ar-5387un", "brcm,bcm6328";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/ar1004g.dts

@@ -8,6 +8,10 @@
 	model = "ASMAX AR 1004g";
 	compatible = "asmax,ar1004g", "brcm,bcm6348";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/bcm96318ref.dts

@@ -8,6 +8,10 @@
 	model = "Broadcom BCM96318REF reference board";
 	compatible = "brcm,bcm96318ref", "brcm,bcm6318";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/bcm96318ref_p300.dts

@@ -8,6 +8,10 @@
 	model = "Broadcom BCM96318REF_P300 reference board";
 	compatible = "brcm,bcm96318ref_p300", "brcm,bcm6318";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/bcm963268bu_p300.dts

@@ -8,6 +8,10 @@
 	model = "Broadcom BCM963268BU_P300 reference board";
 	compatible = "brcm,bcm963268bu_p300", "brcm,bcm63268";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/bcm963269bhr.dts

@@ -8,6 +8,10 @@
 	model = "Broadcom BCM963269BHR reference board";
 	compatible = "brcm,bcm963269bhr", "brcm,bcm63268";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/bcm963281TAN.dts

@@ -8,6 +8,10 @@
 	model = "Broadcom bcm963281TAN reference board";
 	compatible = "brcm,bcm963281TAN", "brcm,bcm6328";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 

target/linux/brcm63xx/dts/bcm96328avng.dts

@@ -8,6 +8,10 @@
 	model = "Broadcom BCM96328avng reference board";
 	compatible = "brcm,bcm96328avng", "brcm,bcm6328";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 

target/linux/brcm63xx/dts/bcm96338GW.dts

@@ -8,6 +8,10 @@
 	model = "Broadcom BCM96338GW reference board";
 	compatible = "brcm,bcm96338gw", "brcm,bcm6338";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 

target/linux/brcm63xx/dts/bcm96338W.dts

@@ -8,6 +8,10 @@
 	model = "Broadcom BCM96338W reference board";
 	compatible = "brcm,bcm96338w", "brcm,bcm6338";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 

target/linux/brcm63xx/dts/bcm96345GW2.dts

@@ -7,4 +7,8 @@
 / {
 	model = "Broadcom BCM96345GW2 reference board";
 	compatible = "brcm,bcm96345gw2", "brcm,bcm6345";
+
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
 };

target/linux/brcm63xx/dts/bcm96348GW-10.dts

@@ -8,6 +8,10 @@
 	model = "Broadcom BCM96348GW-10 reference board";
 	compatible = "brcm,bcm96348gw-10", "brcm,bcm6348";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/bcm96348GW-11.dts

@@ -8,6 +8,10 @@
 	model = "Broadcom BCM96348GW-11 reference board";
 	compatible = "brcm,bcm96348gw-11", "brcm,bcm6348";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/bcm96348GW.dts

@@ -8,6 +8,10 @@
 	model = "Broadcom BCM96348GW reference board";
 	compatible = "brcm,bcm96348gw", "brcm,bcm6348";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/bcm96348R.dts

@@ -8,6 +8,10 @@
 	model = "Broadcom 96348R reference board";
 	compatible = "brcm,bcm96348r", "brcm,bcm6348";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 

target/linux/brcm63xx/dts/bcm96358VW.dts

@@ -8,6 +8,10 @@
 	model = "Broadcom BCM96358VW reference board";
 	compatible = "brcm,bcm96358vw", "brcm,bcm6358";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 

target/linux/brcm63xx/dts/bcm96358VW2.dts

@@ -8,6 +8,10 @@
 	model = "Broadcom BCM96358VW2 reference board";
 	compatible = "brcm,bcm96358vw2", "brcm,bcm6358";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 

target/linux/brcm63xx/dts/bcm96368MVNgr.dts

@@ -8,6 +8,10 @@
 	model = "Broadcom BCM96368MVNgr reference board";
 	compatible = "brcm,bcm96368mvngr", "brcm,bcm6368";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 

target/linux/brcm63xx/dts/bcm96368MVWG.dts

@@ -8,6 +8,10 @@
 	model = "Broadcom BCM96368MVWG reference board";
 	compatible = "brcm,bcm96368mvwg", "brcm,bcm6368";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 

target/linux/brcm63xx/dts/cpva502plus.dts

@@ -8,6 +8,10 @@
 	model = "Telsey CPVA502+";
 	compatible = "telsey,cpva502+", "brcm,bcm6348";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 

target/linux/brcm63xx/dts/cpva642.dts

@@ -8,6 +8,10 @@
 	model = "Telsey CPVA642-type (CPA-ZNTE60T)";
 	compatible = "telsey,cpva642", "brcm,bcm6358";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/ct-5365.dts

@@ -8,6 +8,10 @@
 	model = "Comtrend CT-5365";
 	compatible = "comtrend,ct-5365", "brcm,bcm6348";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/ct-6373.dts

@@ -8,6 +8,10 @@
 	model = "Comtrend CT-6373";
 	compatible = "comtrend,ct-6373", "brcm,bcm6358";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	spi-gpio {
 		#address-cells = <1>;
 		#size-cells = <1>;

target/linux/brcm63xx/dts/ct536plus.dts

@@ -8,6 +8,10 @@
 	model = "Comtrend CT-536+/CT-5621T";
 	compatible = "comtrend,ct536+", "brcm,bcm6348";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/cvg834g.dts

@@ -8,6 +8,10 @@
 	model = "Netgear CVG834G";
 	compatible = "netgear,cvg834g", "brcm,bcm6348";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 

target/linux/brcm63xx/dts/dg834g_v4.dts

@@ -8,6 +8,10 @@
 	model = "Netgear DG834G v4";
 	compatible = "netgear,dg834g-v4", "brcm,bcm6348";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/dg834gtpn.dts

@@ -8,6 +8,10 @@
 	model = "Netgear DG834GT/PN";
 	compatible = "netgear,dg834gtpn", "brcm,bcm6348";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/dgnd3700v1.dts

@@ -8,6 +8,10 @@
 	model = "Netgear DGND3700v1/DGND3800B";
 	compatible = "netgear,dgnd3700v1", "brcm,bcm6368";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/dsl-2640b-b.dts

@@ -8,6 +8,10 @@
 	model = "D-Link DSL-2640B rev B2";
 	compatible = "d-link,dsl-2640b-b", "brcm,bcm6348";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/dsl-2640u.dts

@@ -8,6 +8,10 @@
 	model = "D-Link DSL-2640U/BRU/C";
 	compatible = "d-link,dsl-2640u", "brcm,bcm6338";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 

target/linux/brcm63xx/dts/dsl-2650u.dts

@@ -8,6 +8,10 @@
 	model = "D-Link DSL-2650U";
 	compatible = "d-link,dsl-2650u", "brcm,bcm6358";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 

target/linux/brcm63xx/dts/dsl-274xb-c.dts

@@ -8,6 +8,10 @@
 	model = "D-Link DSL-2740B/DSL-2741B rev C2/3";
 	compatible = "d-link,dsl-274xb-c2", "brcm,bcm6358";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/dsl-274xb-f.dts

@@ -8,6 +8,10 @@
 	model = "D-Link DSL-2740B/DSL-2741B rev F1";
 	compatible = "d-link,dsl-274xb-f", "brcm,bcm6328";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/dsl-275xb-d.dts

@@ -8,6 +8,10 @@
 	model = "D-Link DSL-2750B/DSL-2751 rev D1";
 	compatible = "d-link,dsl-275xb-d", "brcm,bcm6318";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/dv-201amr.dts

@@ -7,6 +7,10 @@
 / {
 	model = "Davolink DV-201AMR";
 	compatible = "davolink,dv-201amr", "brcm,bcm6348";
+
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
 };
 
 &pflash {

target/linux/brcm63xx/dts/dva-g3810bn_tl.dts

@@ -8,6 +8,10 @@
 	model = "D-Link DVA-G3810BN/TL";
 	compatible = "d-link,dva-g3810bn/tl", "brcm,bcm6358";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/evg2000.dts

@@ -8,6 +8,10 @@
 	model = "Netgear EVG2000";
 	compatible = "netgear,evg2000", "brcm,bcm6368";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/f5d7633.dts

@@ -8,6 +8,10 @@
 	model = "Belkin F5D7633";
 	compatible = "belkin,f5d7633", "brcm,bcm6348";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/fast2404.dts

@@ -7,6 +7,10 @@
 / {
 	model = "Sagem F@ST2404";
 	compatible = "sagem,f@st2404", "brcm,bcm6348";
+
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
 };
 
 &pflash {

target/linux/brcm63xx/dts/fast2504n.dts

@@ -8,6 +8,10 @@
 	model = "Sagem F@ST2504n";
 	compatible = "sagem,f@st2504n", "brcm,bcm6362";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/fast2604.dts

@@ -8,6 +8,10 @@
 	model = "Sagem F@ST2604";
 	compatible = "sagem,f@st2604", "brcm,bcm6348";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/fast2704n.dts

@@ -8,6 +8,10 @@
 	model = "Sagem F@ST2704N";
 	compatible = "sagem,f@st2704n", "brcm,bcm6318";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/fast2704v2.dts

@@ -8,6 +8,10 @@
 	model = "Sagem F@ST2704V2";
 	compatible = "sagem,f@st2704v2", "brcm,bcm6328";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/gw6000.dts

@@ -8,6 +8,10 @@
 	model = "TECOM GW6000";
 	compatible = "tecom,gw6000", "brcm,bcm6348";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/gw6200.dts

@@ -8,6 +8,10 @@
 	model = "TECOM GW6200";
 	compatible = "tecom,gw6200", "brcm,bcm6348";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/hg520v.dts

@@ -8,6 +8,10 @@
 	model = "Huawei EchoLife HG520v";
 	compatible = "huawei,hg520v", "brcm,bcm6358";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/hg553.dts

@@ -8,6 +8,10 @@
 	model = "Huawei EchoLife HG553";
 	compatible = "huawei,hg553", "brcm,bcm6358";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/hg556a-a.dts

@@ -8,6 +8,10 @@
 	model = "Huawei EchoLife HG556a (version A)";
 	compatible = "huawei,hg556a-a", "brcm,bcm6358";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/hg556a-b.dts

@@ -8,6 +8,10 @@
 	model = "Huawei EchoLife HG556a (version B)";
 	compatible = "huawei,hg556a-b", "brcm,bcm6358";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/hg556a-c.dts

@@ -8,6 +8,10 @@
 	model = "Huawei EchoLife HG556a (version C)";
 	compatible = "huawei,hg556a-c", "brcm,bcm6358";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/hg622.dts

@@ -8,6 +8,11 @@
 	model = "Huawei HG622";
 	compatible = "huawei,hg622", "brcm,bcm6368";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/hg655b.dts

@@ -8,6 +8,10 @@
 	model = "Huawei HG655b";
 	compatible = "huawei,hg655b", "brcm,bcm6368";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/homehub2a.dts

@@ -8,6 +8,10 @@
 	model = "BT Home Hub 2.0 Type A";
 	compatible = "thomson,homehub2a", "brcm,bcm6358";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	spi-gpio {
 		#address-cells = <1>;
 		#size-cells = <1>;

target/linux/brcm63xx/dts/livebox-blue-5g.dts

@@ -8,6 +8,10 @@
 	model = "Inventel Livebox 1";
 	compatible = "inventel,livebox-blue-5g", "brcm,bcm6348";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/magic.dts

@@ -8,6 +8,10 @@
 	model = "Alice W-Gate";
 	compatible = "telsey,magic", "brcm,bcm6348";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 

target/linux/brcm63xx/dts/nb4-fxc-r1.dts

@@ -8,6 +8,10 @@
 	model = "SFR Neuf Box 4 (Foxconn)";
 	compatible = "sfr,nb4-fxc-r1", "brcm,bcm6358";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	spi-gpio {
 		#address-cells = <1>;
 		#size-cells = <1>;

target/linux/brcm63xx/dts/nb4-ser-r0.dts

@@ -8,6 +8,10 @@
 	model = "SFR Neuf Box 4 (Sercomm)";
 	compatible = "sfr,nb4-ser-r0", "brcm,bcm6358";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	spi-gpio {
 		#address-cells = <1>;
 		#size-cells = <1>;

target/linux/brcm63xx/dts/nb6-ser-r0.dts

@@ -8,6 +8,10 @@
 	model = "SFR neufbox 6 (Sercomm)";
 	compatible = "sfr,nb6-ser-r0", "brcm,bcm6362";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/p870hw-51a-v2.dts

@@ -8,6 +8,10 @@
 	model = "Zyxel P870HW-51a v2";
 	compatible = "zyxel,p870hw-51a-v2", "brcm,bcm6368";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/r5010unv2.dts

@@ -7,6 +7,11 @@
 / {
 	model = "NuCom R5010UN v2";
 	compatible = "nucom,r5010unv2", "brcm,bcm6328";
+
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";

target/linux/brcm63xx/dts/rg100a.dts

@@ -8,6 +8,10 @@
 	model = "Alcatel RG100A";
 	compatible = "alcatel,rg100a", "brcm,bcm6358";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 

target/linux/brcm63xx/dts/rta1025w.dts

@@ -7,6 +7,10 @@
 / {
 	model = "Dynalink RTA1025W";
 	compatible = "dynalink,rta1025w", "brcm,bcm6348";
+
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
 };
 
 &pflash {

target/linux/brcm63xx/dts/rta1320.dts

@@ -8,6 +8,10 @@
 	model = "Dynalink RTA1320";
 	compatible = "dynalink,rta1320", "brcm,bcm6338";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 

target/linux/brcm63xx/dts/rta770bw.dts

@@ -8,6 +8,10 @@
 	model = "Siemens Gigaset SE515";
 	compatible = "dynalink,rta770bw", "brcm,bcm6345";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/rta770w.dts

@@ -8,6 +8,10 @@
 	model = "Dynalink RTA770W";
 	compatible = "dynalink,rta770w", "brcm,bcm6345";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/spw303v.dts

@@ -8,6 +8,10 @@
 	model = "T-Com Speedport W303 V";
 	compatible = "t-com,spw303v", "brcm,bcm6358";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/spw500v.dts

@@ -8,6 +8,10 @@
 	model = "T-Com Speedport W500 V";
 	compatible = "t-com,spw500v", "brcm,bcm6348";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/td-w8900gb.dts

@@ -8,6 +8,10 @@
 	model = "TP-Link TD-W8900GB";
 	compatible = "tp-link,td-w8900gb", "brcm,bcm6348";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/usr9108.dts

@@ -8,6 +8,10 @@
 	model = "USRobotics 9108";
 	compatible = "usr,9108", "brcm,bcm6348";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 

target/linux/brcm63xx/dts/v2110.dts

@@ -8,6 +8,10 @@
 	model = "BT Voyager 2110";
 	compatible = "bt,v2110", "brcm,bcm6348";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/v2500v-bb.dts

@@ -8,6 +8,10 @@
 	model = "BT Voyager V2500V";
 	compatible = "bt,v2500v-bb", "brcm,bcm6348";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/vg50.dts

@@ -8,6 +8,10 @@
 	model = "Inteno VG50";
 	compatible = "inteno,vg50", "brcm,bcm63268";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/vr-3025u.dts

@@ -8,6 +8,10 @@
 	model = "Comtrend VR-3025u";
 	compatible = "comtrend,vr-3025u", "brcm,bcm6368";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/vr-3025un.dts

@@ -8,6 +8,10 @@
 	model = "Comtrend VR-3025un";
 	compatible = "comtrend,vr-3025un", "brcm,bcm6368";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/vr-3026e.dts

@@ -8,6 +8,10 @@
 	model = "Comtrend VR-3026e";
 	compatible = "comtrend,vr-3026e", "brcm,bcm6368";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;

target/linux/brcm63xx/dts/wap-5813n.dts

@@ -8,6 +8,10 @@
 	model = "Comtrend WAP-5813n";
 	compatible = "comtrend,wap-5813n", "brcm,bcm6368";
 
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+	};
+
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;