brcm63xx: switch to mtdsplit_bcm63xx on boards with fixed flash size

This avoids using bcm63xxpart for boards where flash size and primary
partitions are known.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

diff --git a/target/linux/brcm63xx/config-4.4 b/target/linux/brcm63xx/config-4.4
index fb448adc1aae51ec71f2fba7eacf414c8d4c9d9c..45ae595b98d1cc471073d4335594c0936b659d49 100644 (file)
--- a/target/linux/brcm63xx/config-4.4
+++ b/target/linux/brcm63xx/config-4.4
@@ -175,6 +175,8 @@ CONFIG_MTD_PHYSMAP=y
 CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
 CONFIG_MTD_SPI_NOR=y
+CONFIG_MTD_SPLIT_BCM63XX_FW=y
+CONFIG_MTD_SPLIT_FIRMWARE=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_PER_CPU_KM=y
 CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y

diff --git a/target/linux/brcm63xx/dts/a226g.dts b/target/linux/brcm63xx/dts/a226g.dts
index dc24e5a03f57a1a868f767697f2ce69a8976ea4a..558f4aaa3341a896bd391294fe82b5d50973ccbd 100644 (file)
--- a/target/linux/brcm63xx/dts/a226g.dts
+++ b/target/linux/brcm63xx/dts/a226g.dts
@@ -9,7 +9,7 @@
        compatible = "pirelli,a226g", "brcm,bcm6358";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -93,16 +93,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x7e0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/a226m-fwb.dts b/target/linux/brcm63xx/dts/a226m-fwb.dts
index ced66ddfcd411f3e3e566ff0664d1f98d34c7ca8..244b463a9714d4fed02176d2849b2d1e57c2ed20 100644 (file)
--- a/target/linux/brcm63xx/dts/a226m-fwb.dts
+++ b/target/linux/brcm63xx/dts/a226m-fwb.dts
@@ -9,7 +9,7 @@
        compatible = "pirelli,a226m-fwb", "brcm,bcm6358";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -93,16 +93,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x020000>;
                read-only;
        };
 
-       linux@20000 {
-               label = "linux";
+       firmware@20000 {
+               label = "firmware";
                reg = <0x020000 0xfc0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/a226m.dts b/target/linux/brcm63xx/dts/a226m.dts
index 9a9ec1e1eab9a0cf476a93966a24ea7f57f3312a..3c7d91c8ac6988fb7ea6be923232f9ebc5e2138e 100644 (file)
--- a/target/linux/brcm63xx/dts/a226m.dts
+++ b/target/linux/brcm63xx/dts/a226m.dts
@@ -9,7 +9,7 @@
        compatible = "pirelli,a226m", "brcm,bcm6358";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -93,16 +93,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x7e0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/a4001n.dts b/target/linux/brcm63xx/dts/a4001n.dts
index 70eb8cec921a857e99d573c46104a7d495fd31c0..476469f7c1a34a7348e883df6146b0dcd5017b09 100644 (file)
--- a/target/linux/brcm63xx/dts/a4001n.dts
+++ b/target/linux/brcm63xx/dts/a4001n.dts
@@ -9,7 +9,7 @@
        compatible = "adb,a4001n", "brcm,bcm6328";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -71,17 +71,15 @@
                #address-cells = <1>;
                #size-cells = <1>;
 
-               linux,part-probe = "bcm63xxpart";
-
                cfe@0 {
                        reg = <0x000000 0x010000>;
                        label = "cfe";
                        read-only;
                };
 
-               linux@10000 {
+               firmware@10000 {
                        reg = <0x010000 0x7e0000>;
-                       label = "linux";
+                       label = "firmware";
                };
 
                nvram@7f0000 {

diff --git a/target/linux/brcm63xx/dts/a4001n1.dts b/target/linux/brcm63xx/dts/a4001n1.dts
index 8e206866f6baa9666150e4fa9c242c2d3941a716..40b0e72bc58923b54d901261dc613a89a0da0da8 100644 (file)
--- a/target/linux/brcm63xx/dts/a4001n1.dts
+++ b/target/linux/brcm63xx/dts/a4001n1.dts
@@ -9,7 +9,7 @@
        compatible = "adb,a4001n1", "brcm,bcm6328";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -99,17 +99,15 @@
                #address-cells = <1>;
                #size-cells = <1>;
 
-               linux,part-probe = "bcm63xxpart";
-
                cfe@0 {
                        reg = <0x000000 0x010000>;
                        label = "cfe";
                        read-only;
                };
 
-               linux@10000 {
+               firmware@10000 {
                        reg = <0x010000 0xfe0000>;
-                       label = "linux";
+                       label = "firmware";
                };
 
                nvram@ff0000 {

diff --git a/target/linux/brcm63xx/dts/agpf-s0.dts b/target/linux/brcm63xx/dts/agpf-s0.dts
index 3ff9cb2779e410925e1b1efc22d8ead18fbcf051..0be6bda050f45d37579f074e386a080dfd20cafa 100644 (file)
--- a/target/linux/brcm63xx/dts/agpf-s0.dts
+++ b/target/linux/brcm63xx/dts/agpf-s0.dts
@@ -9,7 +9,7 @@
        compatible = "pirelli,agpf-s0", "brcm,bcm6358";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -97,16 +97,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x020000>;
                read-only;
        };
 
-       linux@20000 {
-               label = "linux";
+       firmware@20000 {
+               label = "firmware";
                reg = <0x020000 0xfc0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/ar-5381u.dts b/target/linux/brcm63xx/dts/ar-5381u.dts
index 1912fca5847a1c44a4a9642a82ee8d19336267a7..d0d9c2b43308826cdc469f49b877dd162eaa24e9 100644 (file)
--- a/target/linux/brcm63xx/dts/ar-5381u.dts
+++ b/target/linux/brcm63xx/dts/ar-5381u.dts
@@ -9,7 +9,7 @@
        compatible = "comtrend,ar-5381u", "brcm,bcm6328";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -58,17 +58,15 @@
                #address-cells = <1>;
                #size-cells = <1>;
 
-               linux,part-probe = "bcm63xxpart";
-
                cfe@0 {
                        reg = <0x000000 0x010000>;
                        label = "cfe";
                        read-only;
                };
 
-               linux@10000 {
+               firmware@10000 {
                        reg = <0x010000 0xfe0000>;
-                       label = "linux";
+                       label = "firmware";
                };
 
                nvram@ff0000 {

diff --git a/target/linux/brcm63xx/dts/ar-5387un.dts b/target/linux/brcm63xx/dts/ar-5387un.dts
index bfcd71e62752a380673e10e45a11980a07509ae3..aa237d2f03fff252d8091e2b59316c915ca4ac5a 100644 (file)
--- a/target/linux/brcm63xx/dts/ar-5387un.dts
+++ b/target/linux/brcm63xx/dts/ar-5387un.dts
@@ -9,7 +9,7 @@
        compatible = "comtrend,ar-5387un", "brcm,bcm6328";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -66,17 +66,15 @@
                #address-cells = <1>;
                #size-cells = <1>;
 
-               linux,part-probe = "bcm63xxpart";
-
                cfe@0 {
                        reg = <0x000000 0x010000>;
                        label = "cfe";
                        read-only;
                };
 
-               linux@10000 {
+               firmware@10000 {
                        reg = <0x010000 0xfe0000>;
-                       label = "linux";
+                       label = "firmware";
                };
 
                nvram@ff0000 {

diff --git a/target/linux/brcm63xx/dts/ar1004g.dts b/target/linux/brcm63xx/dts/ar1004g.dts
index 479c934ed529061b155718bc8f94588fa2312eef..46e3cc506af627cb36c8aadb24ffd0f08580b010 100644 (file)
--- a/target/linux/brcm63xx/dts/ar1004g.dts
+++ b/target/linux/brcm63xx/dts/ar1004g.dts
@@ -9,7 +9,7 @@
        compatible = "asmax,ar1004g", "brcm,bcm6348";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -48,16 +48,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x3e0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/av4202n.dts b/target/linux/brcm63xx/dts/av4202n.dts
index 960e233e3b4b0c9e5a2b3087d9cde97a9681b170..2c7eb3bfe9751cd42040a0e83b6afdcc3049efdf 100644 (file)
--- a/target/linux/brcm63xx/dts/av4202n.dts
+++ b/target/linux/brcm63xx/dts/av4202n.dts
@@ -10,7 +10,7 @@
        compatible = "adb,av4202n", "brcm,bcm6368";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -70,16 +70,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x020000>;
                read-only;
        };
 
-       linux@20000 {
-               label = "linux";
+       firmware@20000 {
+               label = "firmware";
                reg = <0x010000 0xfe0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/cpva502plus.dts b/target/linux/brcm63xx/dts/cpva502plus.dts
index 3ddc459836c11bd2144c82d97b2e113dbb09f6a8..57f4d8be42c5fe70152bcc288d5cc85d8e99775b 100644 (file)
--- a/target/linux/brcm63xx/dts/cpva502plus.dts
+++ b/target/linux/brcm63xx/dts/cpva502plus.dts
@@ -9,7 +9,7 @@
        compatible = "telsey,cpva502+", "brcm,bcm6348";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -44,16 +44,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x3e0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/cpva642.dts b/target/linux/brcm63xx/dts/cpva642.dts
index 1a0522de0b2fe79f7c083817933220538de1f55c..c641935066646a4b3a34682a3563d0cd49ea949b 100644 (file)
--- a/target/linux/brcm63xx/dts/cpva642.dts
+++ b/target/linux/brcm63xx/dts/cpva642.dts
@@ -9,7 +9,7 @@
        compatible = "telsey,cpva642", "brcm,bcm6358";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -81,16 +81,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x7e0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/ct-5365.dts b/target/linux/brcm63xx/dts/ct-5365.dts
index 8187be69705449c2dcc08f32c5ab4343be12034b..dc8db42a2f1891614858dd1e1c8e07d2ca7cbe8b 100644 (file)
--- a/target/linux/brcm63xx/dts/ct-5365.dts
+++ b/target/linux/brcm63xx/dts/ct-5365.dts
@@ -9,7 +9,7 @@
        compatible = "comtrend,ct-5365", "brcm,bcm6348";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -58,16 +58,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x3e0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/ct-6373.dts b/target/linux/brcm63xx/dts/ct-6373.dts
index f2a5842c690b57c0d47a93e807fcc86e9e53ea5f..315912abe0235eb5acad0f95f8e70f1f487c1ea8 100644 (file)
--- a/target/linux/brcm63xx/dts/ct-6373.dts
+++ b/target/linux/brcm63xx/dts/ct-6373.dts
@@ -9,7 +9,7 @@
        compatible = "comtrend,ct-6373", "brcm,bcm6358";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        spi-gpio {
@@ -84,16 +84,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x7e0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/ct536plus.dts b/target/linux/brcm63xx/dts/ct536plus.dts
index 8be494048d8c4edcca1981f14bd17bac17d2233e..2e841bba12eb09aa1636978554f8bfde40474453 100644 (file)
--- a/target/linux/brcm63xx/dts/ct536plus.dts
+++ b/target/linux/brcm63xx/dts/ct536plus.dts
@@ -9,7 +9,7 @@
        compatible = "comtrend,ct-536+", "brcm,bcm6348";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -44,16 +44,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x3e0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/cvg834g.dts b/target/linux/brcm63xx/dts/cvg834g.dts
index 519f1f53af2073a6d9cdbb9b00372109852a80c0..3935c8ab276f41ae2044d882d51789a3d018bd27 100644 (file)
--- a/target/linux/brcm63xx/dts/cvg834g.dts
+++ b/target/linux/brcm63xx/dts/cvg834g.dts
@@ -9,7 +9,7 @@
        compatible = "netgear,cvg834g", "brcm,bcm3368";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-leds {
@@ -26,16 +26,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x3e0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/dg834g_v4.dts b/target/linux/brcm63xx/dts/dg834g_v4.dts
index ee63473e3c481e056f4bd094c65d484854a4258b..2e7274e39e0cfd76dd77c7761c670c4e2df95191 100644 (file)
--- a/target/linux/brcm63xx/dts/dg834g_v4.dts
+++ b/target/linux/brcm63xx/dts/dg834g_v4.dts
@@ -9,7 +9,7 @@
        compatible = "netgear,dg834g-v4", "brcm,bcm6348";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -52,16 +52,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x3e0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/dg834gtpn.dts b/target/linux/brcm63xx/dts/dg834gtpn.dts
index 9bd67f4190aaf7e7aa29090880369cfd49e6b5ce..d23ef37100caf37b84a5d124d48b930c365f7489 100644 (file)
--- a/target/linux/brcm63xx/dts/dg834gtpn.dts
+++ b/target/linux/brcm63xx/dts/dg834gtpn.dts
@@ -9,7 +9,7 @@
        compatible = "netgear,dg834gtpn", "brcm,bcm6348";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -56,16 +56,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x3e0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/dgnd3700v1.dts b/target/linux/brcm63xx/dts/dgnd3700v1.dts
index 625e35dc537d3e9c80d03026200a4e602191e376..d492095fd19c9b5bb6bb91a604d3e32ade16596a 100644 (file)
--- a/target/linux/brcm63xx/dts/dgnd3700v1.dts
+++ b/target/linux/brcm63xx/dts/dgnd3700v1.dts
@@ -9,7 +9,7 @@
        compatible = "netgear,dgnd3700v1", "brcm,bcm6368";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -90,16 +90,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x020000>;
                read-only;
        };
 
-       linux@20000 {
-               label = "linux";
+       firmware@20000 {
+               label = "firmware";
                reg = <0x020000 0x1e20000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/dsl-2640b-b.dts b/target/linux/brcm63xx/dts/dsl-2640b-b.dts
index 767586dfb818abf7e26ea0273d3ac17ded557d30..c8ed8c26aed12da2380e57b63cf6b93043d1f116 100644 (file)
--- a/target/linux/brcm63xx/dts/dsl-2640b-b.dts
+++ b/target/linux/brcm63xx/dts/dsl-2640b-b.dts
@@ -9,7 +9,7 @@
        compatible = "d-link,dsl-2640b-b", "brcm,bcm6348";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -52,16 +52,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x3e0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/dsl-2640u.dts b/target/linux/brcm63xx/dts/dsl-2640u.dts
index 3b94a4abcb0aa85a3ecea0f9104d30ca7f6186dc..a67f43589713b4badbac32049b800722d34bf554 100644 (file)
--- a/target/linux/brcm63xx/dts/dsl-2640u.dts
+++ b/target/linux/brcm63xx/dts/dsl-2640u.dts
@@ -9,7 +9,7 @@
        compatible = "d-link,dsl-2640u", "brcm,bcm6338";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-leds {
@@ -36,16 +36,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x3e0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/dsl-2650u.dts b/target/linux/brcm63xx/dts/dsl-2650u.dts
index ed42f6334635a5838efed15b71ac20291db6b12d..43a20c2780ef1197a7cbaae69c1fd7d43efb47f8 100644 (file)
--- a/target/linux/brcm63xx/dts/dsl-2650u.dts
+++ b/target/linux/brcm63xx/dts/dsl-2650u.dts
@@ -9,7 +9,7 @@
        compatible = "d-link,dsl-2650u", "brcm,bcm6358";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-leds {
@@ -38,16 +38,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x7e0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/dsl-274xb-c.dts b/target/linux/brcm63xx/dts/dsl-274xb-c.dts
index 10bf9a54afac873966f82326839c30a107222af5..7c8a3305b62ef216db6fcb0b45f8193281d94ec0 100644 (file)
--- a/target/linux/brcm63xx/dts/dsl-274xb-c.dts
+++ b/target/linux/brcm63xx/dts/dsl-274xb-c.dts
@@ -9,7 +9,7 @@
        compatible = "d-link,dsl-274xb-c2", "brcm,bcm6358";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -56,16 +56,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x3e0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/dsl-274xb-f.dts b/target/linux/brcm63xx/dts/dsl-274xb-f.dts
index 08a55923d5ffbd1a2dcc04cc8cfe89e5cea19c3f..218c4b123cb6cbb78d6a23a922cb892fecadc354 100644 (file)
--- a/target/linux/brcm63xx/dts/dsl-274xb-f.dts
+++ b/target/linux/brcm63xx/dts/dsl-274xb-f.dts
@@ -9,7 +9,7 @@
        compatible = "d-link,dsl-274xb-f", "brcm,bcm6328";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -80,17 +80,15 @@
                #address-cells = <1>;
                #size-cells = <1>;
 
-               linux,part-probe = "bcm63xxpart";
-
                cfe@0 {
                        reg = <0x000000 0x010000>;
                        label = "cfe";
                        read-only;
                };
 
-               linux@10000 {
+               firmware@10000 {
                        reg = <0x010000 0x7c0000>;
-                       label = "linux";
+                       label = "firmware";
                };
 
                cal_data@7d0000 {

diff --git a/target/linux/brcm63xx/dts/dsl-275xb-d.dts b/target/linux/brcm63xx/dts/dsl-275xb-d.dts
index cae6f37ad7310f641947beeba9903d1fbf585ff6..0e24a7d1738538d5c56955c9c2f978cde786aaf1 100644 (file)
--- a/target/linux/brcm63xx/dts/dsl-275xb-d.dts
+++ b/target/linux/brcm63xx/dts/dsl-275xb-d.dts
@@ -9,7 +9,7 @@
        compatible = "d-link,dsl-275xb-d", "brcm,bcm6318";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -93,17 +93,15 @@
                #address-cells = <1>;
                #size-cells = <1>;
 
-               linux,part-probe = "bcm63xxpart";
-
                cfe@0 {
                        reg = <0x000000 0x010000>;
                        label = "cfe";
                        read-only;
                };
 
-               linux@10000 {
+               firmware@10000 {
                        reg = <0x010000 0x7e0000>;
-                       label = "linux";
+                       label = "firmware";
                };
 
                nvram@7f0000 {

diff --git a/target/linux/brcm63xx/dts/dv-201amr.dts b/target/linux/brcm63xx/dts/dv-201amr.dts
index 9d96e7471ef3a2c111aa79763dbace1482d79b4a..c5d908f6713c5c22bd912e8d9947e71186e427b4 100644 (file)
--- a/target/linux/brcm63xx/dts/dv-201amr.dts
+++ b/target/linux/brcm63xx/dts/dv-201amr.dts
@@ -9,7 +9,7 @@
        compatible = "davolink,dv-201amr", "brcm,bcm6348";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 };
 
@@ -29,8 +29,8 @@
                read-only;
        };
 
-       linux@410000 {
-               label = "linux";
+       firmware@410000 {
+               label = "firmware";
                reg = <0x410000 0x3f0000>;
        };
 };

diff --git a/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts b/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts
index abd358e1ae7050f2ed1d76b0fd123a91753a63fc..28fc40e30e2c6950844569c8128c846d9d4b00eb 100644 (file)
--- a/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts
+++ b/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts
@@ -9,7 +9,7 @@
        compatible = "d-link,dva-g3810bn/tl", "brcm,bcm6358";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -56,16 +56,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x7e0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/evg2000.dts b/target/linux/brcm63xx/dts/evg2000.dts
index 79f26b9850931e2f902f418ff54c8d775e9144a3..25b560afbc699cac4f04ff486b55ec1827a63902 100644 (file)
--- a/target/linux/brcm63xx/dts/evg2000.dts
+++ b/target/linux/brcm63xx/dts/evg2000.dts
@@ -9,7 +9,7 @@
        compatible = "netgear,evg2000", "brcm,bcm6368";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -81,16 +81,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x00000000 0x00020000>;
                read-only;
        };
 
-       linux@20000 {
-               label = "linux";
+       firmware@20000 {
+               label = "firmware";
                reg = <0x00020000 0x00f40000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/f5d7633.dts b/target/linux/brcm63xx/dts/f5d7633.dts
index 2dae1aff723c6f401a7726434a0b35c86c5002ab..8d72c6bac4f28aea3d3ce36ea1e0efd9760e0881 100644 (file)
--- a/target/linux/brcm63xx/dts/f5d7633.dts
+++ b/target/linux/brcm63xx/dts/f5d7633.dts
@@ -9,7 +9,7 @@
        compatible = "belkin,f5d7633", "brcm,bcm6348";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -56,16 +56,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x020000>;
                read-only;
        };
 
-       linux@20000 {
-               label = "linux";
+       firmware@20000 {
+               label = "firmware";
                reg = <0x020000 0x3c0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/fast2404.dts b/target/linux/brcm63xx/dts/fast2404.dts
index 29211e6d1783ec41ed3f0dc4e7c1bf5643dee620..e2a93ea2dfbbc4c44f1de05d0167597467d8ab3a 100644 (file)
--- a/target/linux/brcm63xx/dts/fast2404.dts
+++ b/target/linux/brcm63xx/dts/fast2404.dts
@@ -9,23 +9,21 @@
        compatible = "sagem,f@st2404", "brcm,bcm6348";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 };
 
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x3e0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/fast2504n.dts b/target/linux/brcm63xx/dts/fast2504n.dts
index 54923388d978ce988bb0e166769272a6b3797b93..d0abcc9eb058fdba790bb0f562b1f3fa074a7cd2 100644 (file)
--- a/target/linux/brcm63xx/dts/fast2504n.dts
+++ b/target/linux/brcm63xx/dts/fast2504n.dts
@@ -9,7 +9,7 @@
        compatible = "sagem,f@st2504n", "brcm,bcm6362";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -75,17 +75,15 @@
                #address-cells = <1>;
                #size-cells = <1>;
 
-               linux,part-probe = "bcm63xxpart";
-
                cfe@0 {
                        reg = <0x000000 0x010000>;
                        label = "cfe";
                        read-only;
                };
 
-               linux@10000 {
+               firmware@10000 {
                        reg = <0x010000 0x7e0000>;
-                       label = "linux";
+                       label = "firmware";
                };
 
                nvram@7f0000 {

diff --git a/target/linux/brcm63xx/dts/fast2604.dts b/target/linux/brcm63xx/dts/fast2604.dts
index 5d7192fc0577e856f94ee6212771184036c6a287..9149f4d425023f04bfed6cfcfce564bebbd93946 100644 (file)
--- a/target/linux/brcm63xx/dts/fast2604.dts
+++ b/target/linux/brcm63xx/dts/fast2604.dts
@@ -9,7 +9,7 @@
        compatible = "sagem,f@st2604", "brcm,bcm6348";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -52,16 +52,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x3e0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/fast2704n.dts b/target/linux/brcm63xx/dts/fast2704n.dts
index 8a3c05b9ac720d79821d297bdd5c8851d4a9d168..49a70ca6e07b5311c7de6e93d6d3c85e3759c779 100644 (file)
--- a/target/linux/brcm63xx/dts/fast2704n.dts
+++ b/target/linux/brcm63xx/dts/fast2704n.dts
@@ -9,7 +9,7 @@
        compatible = "sagem,f@st2704n", "brcm,bcm6318";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -100,17 +100,15 @@
                #address-cells = <1>;
                #size-cells = <1>;
 
-               linux,part-probe = "bcm63xxpart";
-
                cfe@0 {
                        reg = <0x000000 0x010000>;
                        label = "cfe";
                        read-only;
                };
 
-               linux@10000 {
+               firmware@10000 {
                        reg = <0x010000 0x7e0000>;
-                       label = "linux";
+                       label = "firmware";
                };
 
                nvram@7f0000 {

diff --git a/target/linux/brcm63xx/dts/fast2704v2.dts b/target/linux/brcm63xx/dts/fast2704v2.dts
index 617b1ed1a203cc927e6a22ceb6559abeca6ac1da..e927567212867f7248999e75beb4e1e52a9e5267 100644 (file)
--- a/target/linux/brcm63xx/dts/fast2704v2.dts
+++ b/target/linux/brcm63xx/dts/fast2704v2.dts
@@ -9,7 +9,7 @@
        compatible = "sagem,f@st2704v2", "brcm,bcm6328";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -84,17 +84,15 @@
                #address-cells = <1>;
                #size-cells = <1>;
 
-               linux,part-probe = "bcm63xxpart";
-
                cfe@0 {
                        reg = <0x000000 0x010000>;
                        label = "cfe";
                        read-only;
                };
 
-               linux@10000 {
+               firmware@10000 {
                        reg = <0x010000 0x7e0000>;
-                       label = "linux";
+                       label = "firmware";
                };
 
                nvram@7f0000 {

diff --git a/target/linux/brcm63xx/dts/gw6000.dts b/target/linux/brcm63xx/dts/gw6000.dts
index 14c6330680d6fc013fee0060a6a53a72aba307f6..a8c5934e37141c75713169ddf704d8fc196306c0 100644 (file)
--- a/target/linux/brcm63xx/dts/gw6000.dts
+++ b/target/linux/brcm63xx/dts/gw6000.dts
@@ -9,7 +9,7 @@
        compatible = "tecom,gw6000", "brcm,bcm6348";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -30,16 +30,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x3e0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/gw6200.dts b/target/linux/brcm63xx/dts/gw6200.dts
index c02975ee8dfc73d384551d27cc45a531981e7791..bbcb2f4af517cf8c100522b281196593d29bdbdb 100644 (file)
--- a/target/linux/brcm63xx/dts/gw6200.dts
+++ b/target/linux/brcm63xx/dts/gw6200.dts
@@ -9,7 +9,7 @@
        compatible = "tecom,gw6200", "brcm,bcm6348";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -51,16 +51,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x7e0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/hg520v.dts b/target/linux/brcm63xx/dts/hg520v.dts
index a86311f08ec894ca38ca884b7d1041bdd0db0902..3b283cffc5bb09ff8f03bada309d0f1ac7d430a3 100644 (file)
--- a/target/linux/brcm63xx/dts/hg520v.dts
+++ b/target/linux/brcm63xx/dts/hg520v.dts
@@ -9,7 +9,7 @@
        compatible = "huawei,hg520v", "brcm,bcm6358";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -39,16 +39,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x3e0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/hg553.dts b/target/linux/brcm63xx/dts/hg553.dts
index cc6b3315117cede2d40427c2a2421e864b1e13ca..b5c7124b851af8d2f6bc54f4b749cc7a654a7f56 100644 (file)
--- a/target/linux/brcm63xx/dts/hg553.dts
+++ b/target/linux/brcm63xx/dts/hg553.dts
@@ -9,7 +9,7 @@
        compatible = "huawei,hg553", "brcm,bcm6358";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -78,16 +78,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x020000>;
                read-only;
        };
 
-       linux@20000 {
-               label = "linux";
+       firmware@20000 {
+               label = "firmware";
                reg = <0x020000 0xfc0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/hg556a-a.dts b/target/linux/brcm63xx/dts/hg556a-a.dts
index b9f5842b07dad33de26c23e0e5106710eb3cc7e0..df7239c78596708e1fc3ad3a894c001453110bb7 100644 (file)
--- a/target/linux/brcm63xx/dts/hg556a-a.dts
+++ b/target/linux/brcm63xx/dts/hg556a-a.dts
@@ -9,7 +9,7 @@
        compatible = "huawei,hg556a-a", "brcm,bcm6358";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -104,16 +104,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x020000>;
                read-only;
        };
 
-       linux@20000 {
-               label = "linux";
+       firmware@20000 {
+               label = "firmware";
                reg = <0x020000 0xec0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/hg556a-b.dts b/target/linux/brcm63xx/dts/hg556a-b.dts
index 40f79cd135984c478f1913db23b3a2c59cb06423..23ac9c0ad8700762b8f2d6904692552c2640a696 100644 (file)
--- a/target/linux/brcm63xx/dts/hg556a-b.dts
+++ b/target/linux/brcm63xx/dts/hg556a-b.dts
@@ -9,7 +9,7 @@
        compatible = "huawei,hg556a-b", "brcm,bcm6358";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -104,16 +104,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x020000>;
                read-only;
        };
 
-       linux@20000 {
-               label = "linux";
+       firmware@20000 {
+               label = "firmware";
                reg = <0x020000 0xec0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/hg556a-c.dts b/target/linux/brcm63xx/dts/hg556a-c.dts
index ada2a8ca0c2efb2674c936f1edeada5246588cf2..a5a921e4330889ffe59c06ef08ac1d9b14461001 100644 (file)
--- a/target/linux/brcm63xx/dts/hg556a-c.dts
+++ b/target/linux/brcm63xx/dts/hg556a-c.dts
@@ -9,7 +9,7 @@
        compatible = "huawei,hg556a-c", "brcm,bcm6358";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -99,16 +99,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x020000>;
                read-only;
        };
 
-       linux@20000 {
-               label = "linux";
+       firmware@20000 {
+               label = "firmware";
                reg = <0x020000 0xec0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/hg622.dts b/target/linux/brcm63xx/dts/hg622.dts
index 6dee418edb665ab7a4ab2f1b1e97ecab7f31532c..531d52a68f5fe8b7b2974077c3c552df4bed7063 100644 (file)
--- a/target/linux/brcm63xx/dts/hg622.dts
+++ b/target/linux/brcm63xx/dts/hg622.dts
@@ -9,7 +9,7 @@
        compatible = "huawei,hg622", "brcm,bcm6368";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
 
@@ -53,16 +53,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x020000>;
                read-only;
        };
 
-       linux@20000 {
-               label = "linux";
+       firmware@20000 {
+               label = "firmware";
                reg = <0x020000 0xf80000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/hg655b.dts b/target/linux/brcm63xx/dts/hg655b.dts
index 58ef715a93579ce8e108adcff8e8a46b5a1eb18c..616abfabd731c8b9734f1897ae7fca48f5e28edf 100644 (file)
--- a/target/linux/brcm63xx/dts/hg655b.dts
+++ b/target/linux/brcm63xx/dts/hg655b.dts
@@ -9,7 +9,7 @@
        compatible = "huawei,hg655b", "brcm,bcm6368";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -70,15 +70,13 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x020000>;
        };
 
-       linux@20000 {
-               label = "linux";
+       firmware@20000 {
+               label = "firmware";
                reg = <0x020000 0x770000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/homehub2a.dts b/target/linux/brcm63xx/dts/homehub2a.dts
index b86a48fe40daf24c272c1e1dd3d009e0c86f8637..7cefae81bc246b229f174d83b8ea0129209d6459 100644 (file)
--- a/target/linux/brcm63xx/dts/homehub2a.dts
+++ b/target/linux/brcm63xx/dts/homehub2a.dts
@@ -9,7 +9,7 @@
        compatible = "thomson,homehub2a", "brcm,bcm6358";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        spi-gpio {
@@ -127,15 +127,13 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x020000>;
        };
 
-       linux@20000 {
-               label = "linux";
+       firmware@20000 {
+               label = "firmware";
                reg = <0x020000 0xfc0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/magic.dts b/target/linux/brcm63xx/dts/magic.dts
index be1052409479b5c4499f5556ee1109d7b2fae58d..bd4959fff138e821b25ebc5f0fa04bdf530b4ccd 100644 (file)
--- a/target/linux/brcm63xx/dts/magic.dts
+++ b/target/linux/brcm63xx/dts/magic.dts
@@ -9,7 +9,7 @@
        compatible = "telsey,magic", "brcm,bcm6348";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-leds {
@@ -56,16 +56,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x3e0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/nb6-ser-r0.dts b/target/linux/brcm63xx/dts/nb6-ser-r0.dts
index c0182f33e124d1fef177d53a62eb2a7c41674a61..604f60a867898f32dd6a8307888b34e4823d3bd5 100644 (file)
--- a/target/linux/brcm63xx/dts/nb6-ser-r0.dts
+++ b/target/linux/brcm63xx/dts/nb6-ser-r0.dts
@@ -9,7 +9,7 @@
        compatible = "sfr,nb6-ser-r0", "brcm,bcm6362";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -63,17 +63,15 @@
                #address-cells = <1>;
                #size-cells = <1>;
 
-               linux,part-probe = "bcm63xxpart";
-
                cfe@0 {
                        reg = <0x000000 0x010000>;
                        label = "cfe";
                        read-only;
                };
 
-               linux@10000 {
+               firmware@10000 {
                        reg = <0x010000 0xfe0000>;
-                       label = "linux";
+                       label = "firmware";
                };
 
                nvram@ff0000 {

diff --git a/target/linux/brcm63xx/dts/p870hw-51a-v2.dts b/target/linux/brcm63xx/dts/p870hw-51a-v2.dts
index 962d474398da44f1d7594756ec912f971b67cf78..2d6b20fb6f41b2fe2b696427333fca4474178d19 100644 (file)
--- a/target/linux/brcm63xx/dts/p870hw-51a-v2.dts
+++ b/target/linux/brcm63xx/dts/p870hw-51a-v2.dts
@@ -9,7 +9,7 @@
        compatible = "zyxel,p870hw-51a-v2", "brcm,bcm6368";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -61,16 +61,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x3e0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/r5010unv2.dts b/target/linux/brcm63xx/dts/r5010unv2.dts
index cce861b313596bad52526ecd1caed19216c0b377..53265a122db1b2cfd5df6d5b40c3afa79f28b3e0 100644 (file)
--- a/target/linux/brcm63xx/dts/r5010unv2.dts
+++ b/target/linux/brcm63xx/dts/r5010unv2.dts
@@ -9,7 +9,7 @@
        compatible = "nucom,r5010unv2", "brcm,bcm6328";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        
@@ -80,17 +80,15 @@
                #address-cells = <1>;
                #size-cells = <1>;
 
-               linux,part-probe = "bcm63xxpart";
-
                cfe@0 {
                        reg = <0x000000 0x010000>;
                        label = "cfe";
                        read-only;
                };
 
-               linux@10000 {
+               firmware@10000 {
                        reg = <0x010000 0x7e0000>;
-                       label = "linux";
+                       label = "firmware";
                };
 
                nvram@7f0000 {

diff --git a/target/linux/brcm63xx/dts/rg100a.dts b/target/linux/brcm63xx/dts/rg100a.dts
index 770ceee3562bd267f17a07183e9195d0cf1ed52b..d3d977c303e0d12b26de060a98a0f2b0afbf7881 100644 (file)
--- a/target/linux/brcm63xx/dts/rg100a.dts
+++ b/target/linux/brcm63xx/dts/rg100a.dts
@@ -9,7 +9,7 @@
        compatible = "alcatel,rg100a", "brcm,bcm6358";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-leds {
@@ -38,16 +38,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x020000>;
                read-only;
        };
 
-       linux@20000 {
-               label = "linux";
+       firmware@20000 {
+               label = "firmware";
                reg = <0x020000 0xfc0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/rta1025w.dts b/target/linux/brcm63xx/dts/rta1025w.dts
index 4758ab3a23c35f20c681a566516ccc87e1b78bee..64dfc190a3546c3c39fc2a326b7e37267c7730ea 100644 (file)
--- a/target/linux/brcm63xx/dts/rta1025w.dts
+++ b/target/linux/brcm63xx/dts/rta1025w.dts
@@ -9,23 +9,21 @@
        compatible = "dynalink,rta1025w", "brcm,bcm6348";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 };
 
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x3e0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/rta1320.dts b/target/linux/brcm63xx/dts/rta1320.dts
index 6dbf0a5a91418157caa560c5453893f65105d0c6..6a546a3c95d3e6531926fe3aae510a759829b5cf 100644 (file)
--- a/target/linux/brcm63xx/dts/rta1320.dts
+++ b/target/linux/brcm63xx/dts/rta1320.dts
@@ -9,7 +9,7 @@
        compatible = "dynalink,rta1320", "brcm,bcm6338";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-leds {
@@ -38,16 +38,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x3e0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/rta770bw.dts b/target/linux/brcm63xx/dts/rta770bw.dts
index bb92d1ec0bb2977763b71b9e3f9455997078ecc1..4e3816fbdbfd42d7027ad5cc4b46c3574f6d1c71 100644 (file)
--- a/target/linux/brcm63xx/dts/rta770bw.dts
+++ b/target/linux/brcm63xx/dts/rta770bw.dts
@@ -9,7 +9,7 @@
        compatible = "dynalink,rta770bw", "brcm,bcm6345";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -54,16 +54,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x3e0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/rta770w.dts b/target/linux/brcm63xx/dts/rta770w.dts
index 7cefa5008d1555a05318eafad24b905bc5e382fc..c8748806b1aad038c40367b7c527e6d129189a6a 100644 (file)
--- a/target/linux/brcm63xx/dts/rta770w.dts
+++ b/target/linux/brcm63xx/dts/rta770w.dts
@@ -9,7 +9,7 @@
        compatible = "dynalink,rta770w", "brcm,bcm6345";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -54,16 +54,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x3e0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/spw303v.dts b/target/linux/brcm63xx/dts/spw303v.dts
index 8128fbdfb66c8d698a085ee29247000ec751ffa1..fea80264bab871be9326ae1cc4be5db438b55524 100644 (file)
--- a/target/linux/brcm63xx/dts/spw303v.dts
+++ b/target/linux/brcm63xx/dts/spw303v.dts
@@ -9,7 +9,7 @@
        compatible = "t-com,spw303v", "brcm,bcm6358";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -65,16 +65,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x7e0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/spw500v.dts b/target/linux/brcm63xx/dts/spw500v.dts
index 4fe32d6f162067264c07cf346f15780f5f14d009..dbf8d5a89f63a3da5a047e4f821780cc7ed4b61a 100644 (file)
--- a/target/linux/brcm63xx/dts/spw500v.dts
+++ b/target/linux/brcm63xx/dts/spw500v.dts
@@ -9,7 +9,7 @@
        compatible = "t-com,spw500v", "brcm,bcm6348";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -56,16 +56,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x3e0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/td-w8900gb.dts b/target/linux/brcm63xx/dts/td-w8900gb.dts
index 6e13f3f52c19c1ac5774f5e68f4445c87a76a00f..3cdb7282cb5eb25ffdf2e493684e75968002243c 100644 (file)
--- a/target/linux/brcm63xx/dts/td-w8900gb.dts
+++ b/target/linux/brcm63xx/dts/td-w8900gb.dts
@@ -9,7 +9,7 @@
        compatible = "tp-link,td-w8900gb", "brcm,bcm6348";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -56,16 +56,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x020000>;
                read-only;
        };
 
-       linux@20000 {
-               label = "linux";
+       firmware@20000 {
+               label = "firmware";
                reg = <0x020000 0x3d0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/usr9108.dts b/target/linux/brcm63xx/dts/usr9108.dts
index 25415abe04ea12f0ad496536c391b53cfeacad70..86516eec8dee7c05a9e05283d558972eba6f3114 100644 (file)
--- a/target/linux/brcm63xx/dts/usr9108.dts
+++ b/target/linux/brcm63xx/dts/usr9108.dts
@@ -9,7 +9,7 @@
        compatible = "usr,9108", "brcm,bcm6348";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-leds {
@@ -29,16 +29,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x3e0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/v2110.dts b/target/linux/brcm63xx/dts/v2110.dts
index 13230a05ba1941fb83d577227c39226b1c7aa2fb..66bf5115c9bb38009b43a9611fa91e5dbb1f4ade 100644 (file)
--- a/target/linux/brcm63xx/dts/v2110.dts
+++ b/target/linux/brcm63xx/dts/v2110.dts
@@ -9,7 +9,7 @@
        compatible = "bt,v2110", "brcm,bcm6348";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -55,16 +55,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x3e0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/v2500v-bb.dts b/target/linux/brcm63xx/dts/v2500v-bb.dts
index bc1a717e0687994863884517cffdb2aa416cc1ac..c55a2fc1047a9c98a483a916c2d14aa74bec0daa 100644 (file)
--- a/target/linux/brcm63xx/dts/v2500v-bb.dts
+++ b/target/linux/brcm63xx/dts/v2500v-bb.dts
@@ -9,7 +9,7 @@
        compatible = "bt,v2500v-bb", "brcm,bcm6348";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -55,16 +55,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x3e0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/vh4032n.dts b/target/linux/brcm63xx/dts/vh4032n.dts
index 8b8abd9b4a1726f7baf5bfe69a17c37c084751cb..78ac9af2924fbcb361ad1b3ff34d489ea1e2ca77 100644 (file)
--- a/target/linux/brcm63xx/dts/vh4032n.dts
+++ b/target/linux/brcm63xx/dts/vh4032n.dts
@@ -9,7 +9,7 @@
        compatible = "observa,vh4032n", "brcm,bcm6368";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -82,16 +82,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x0000000 0x0020000>;
                read-only;
        };
 
-       linux@20000 {
-               label = "linux";
+       firmware@20000 {
+               label = "firmware";
                reg = <0x0020000 0x1fc0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/vr-3025u.dts b/target/linux/brcm63xx/dts/vr-3025u.dts
index 63b1427704461ba07c6578748e891b38d5675a9a..a3a939c91d5e688af4a7df1e391ece34943ac2ea 100644 (file)
--- a/target/linux/brcm63xx/dts/vr-3025u.dts
+++ b/target/linux/brcm63xx/dts/vr-3025u.dts
@@ -9,7 +9,7 @@
        compatible = "comtrend,vr-3025u", "brcm,bcm6368";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -56,16 +56,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x0000000 0x0020000>;
                read-only;
        };
 
-       linux@20000 {
-               label = "linux";
+       firmware@20000 {
+               label = "firmware";
                reg = <0x0020000 0x1fc0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/vr-3025un.dts b/target/linux/brcm63xx/dts/vr-3025un.dts
index 864eb8216ea60342d29c9b310f583b775acb244d..f616883c66acf12f04f2d401f46b7dc1af336c4b 100644 (file)
--- a/target/linux/brcm63xx/dts/vr-3025un.dts
+++ b/target/linux/brcm63xx/dts/vr-3025un.dts
@@ -9,7 +9,7 @@
        compatible = "comtrend,vr-3025un", "brcm,bcm6368";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -56,16 +56,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x7e0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/vr-3026e.dts b/target/linux/brcm63xx/dts/vr-3026e.dts
index eecbf56d127bd16d2168be0dc161ceb5be63c78d..d81be951169b802c7b8ae9765df38abedef6b0f1 100644 (file)
--- a/target/linux/brcm63xx/dts/vr-3026e.dts
+++ b/target/linux/brcm63xx/dts/vr-3026e.dts
@@ -9,7 +9,7 @@
        compatible = "comtrend,vr-3026e", "brcm,bcm6368";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -56,16 +56,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x7e0000>;
        };
 

diff --git a/target/linux/brcm63xx/dts/wap-5813n.dts b/target/linux/brcm63xx/dts/wap-5813n.dts
index f37065eee01e801425f35728641a5565c90aa2d0..00822cecb80776e9e8fd53a9824cc4162c702a2e 100644 (file)
--- a/target/linux/brcm63xx/dts/wap-5813n.dts
+++ b/target/linux/brcm63xx/dts/wap-5813n.dts
@@ -9,7 +9,7 @@
        compatible = "comtrend,wap-5813n", "brcm,bcm6368";
 
        chosen {
-               bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
@@ -66,16 +66,14 @@
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
-
        cfe@0 {
                label = "CFE";
                reg = <0x000000 0x010000>;
                read-only;
        };
 
-       linux@10000 {
-               label = "linux";
+       firmware@10000 {
+               label = "firmware";
                reg = <0x010000 0x7e0000>;
        };