From: Álvaro Fernández Rojas Date: Sun, 26 Mar 2017 11:05:06 +0000 (+0200) Subject: brcm63xx: switch to mtdsplit_bcm63xx on boards with fixed flash size X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=refs%2Fheads%2Fbrcm63xx-mtdsplit;p=openwrt%2Fstaging%2Fnoltari.git 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 --- diff --git a/target/linux/brcm63xx/config-4.4 b/target/linux/brcm63xx/config-4.4 index fb448adc1a..45ae595b98 100644 --- 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 dc24e5a03f..558f4aaa33 100644 --- 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 ced66ddfcd..244b463a97 100644 --- 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 9a9ec1e1ea..3c7d91c8ac 100644 --- 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 70eb8cec92..476469f7c1 100644 --- 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 8e206866f6..40b0e72bc5 100644 --- 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 3ff9cb2779..0be6bda050 100644 --- 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 1912fca584..d0d9c2b433 100644 --- 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 bfcd71e627..aa237d2f03 100644 --- 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 479c934ed5..46e3cc506a 100644 --- 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 960e233e3b..2c7eb3bfe9 100644 --- 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 3ddc459836..57f4d8be42 100644 --- 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 1a0522de0b..c641935066 100644 --- 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 8187be6970..dc8db42a2f 100644 --- 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 f2a5842c69..315912abe0 100644 --- 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 8be494048d..2e841bba12 100644 --- 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 519f1f53af..3935c8ab27 100644 --- 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 ee63473e3c..2e7274e39e 100644 --- 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 9bd67f4190..d23ef37100 100644 --- 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 625e35dc53..d492095fd1 100644 --- 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 767586dfb8..c8ed8c26ae 100644 --- 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 3b94a4abcb..a67f435897 100644 --- 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 ed42f63346..43a20c2780 100644 --- 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 10bf9a54af..7c8a3305b6 100644 --- 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 08a55923d5..218c4b123c 100644 --- 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 cae6f37ad7..0e24a7d173 100644 --- 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 9d96e7471e..c5d908f671 100644 --- 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 abd358e1ae..28fc40e30e 100644 --- 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 79f26b9850..25b560afbc 100644 --- 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 2dae1aff72..8d72c6bac4 100644 --- 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 29211e6d17..e2a93ea2df 100644 --- 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 54923388d9..d0abcc9eb0 100644 --- 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 5d7192fc05..9149f4d425 100644 --- 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 8a3c05b9ac..49a70ca6e0 100644 --- 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 617b1ed1a2..e927567212 100644 --- 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 14c6330680..a8c5934e37 100644 --- 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 c02975ee8d..bbcb2f4af5 100644 --- 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 a86311f08e..3b283cffc5 100644 --- 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 cc6b331511..b5c7124b85 100644 --- 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 b9f5842b07..df7239c785 100644 --- 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 40f79cd135..23ac9c0ad8 100644 --- 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 ada2a8ca0c..a5a921e433 100644 --- 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 6dee418edb..531d52a68f 100644 --- 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 58ef715a93..616abfabd7 100644 --- 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 b86a48fe40..7cefae81bc 100644 --- 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 be10524094..bd4959fff1 100644 --- 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 c0182f33e1..604f60a867 100644 --- 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 962d474398..2d6b20fb6f 100644 --- 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 cce861b313..53265a122d 100644 --- 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 770ceee356..d3d977c303 100644 --- 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 4758ab3a23..64dfc190a3 100644 --- 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 6dbf0a5a91..6a546a3c95 100644 --- 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 bb92d1ec0b..4e3816fbdb 100644 --- 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 7cefa5008d..c8748806b1 100644 --- 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 8128fbdfb6..fea80264ba 100644 --- 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 4fe32d6f16..dbf8d5a89f 100644 --- 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 6e13f3f52c..3cdb7282cb 100644 --- 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 25415abe04..86516eec8d 100644 --- 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 13230a05ba..66bf5115c9 100644 --- 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 bc1a717e06..c55a2fc104 100644 --- 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 8b8abd9b4a..78ac9af292 100644 --- 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 63b1427704..a3a939c91d 100644 --- 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 864eb8216e..f616883c66 100644 --- 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 eecbf56d12..d81be95116 100644 --- 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 f37065eee0..00822cecb8 100644 --- 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>; };