brcm63xx: switch to new partition layout specification

Now that we support parsing the expected upstream definition, update
the dts files to it.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>

diff --git a/target/linux/brcm63xx/dts/a226g.dts b/target/linux/brcm63xx/dts/a226g.dts
index 921e46c7966113a618cd3bd455413d1e4160dd12..539f776af835d7c4126ddb95a08e30c1bb1b4d14 100644 (file)
--- a/target/linux/brcm63xx/dts/a226g.dts
+++ b/target/linux/brcm63xx/dts/a226g.dts
@@ -96,20 +96,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x7e0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       nvram@7f0000 {
-               label = "nvram";
-               reg = <0x7f0000 0x010000>;
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x7e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@7f0000 {
+                       label = "nvram";
+                       reg = <0x7f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/a226m-fwb.dts b/target/linux/brcm63xx/dts/a226m-fwb.dts
index c21d06ec5b13192b8321173c2fe31e9b3ea3b29e..6c88d5378d9e0ec7b1b0d93071e682c61cc0eb14 100644 (file)
--- a/target/linux/brcm63xx/dts/a226m-fwb.dts
+++ b/target/linux/brcm63xx/dts/a226m-fwb.dts
@@ -96,20 +96,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x020000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@20000 {
-               label = "linux";
-               reg = <0x020000 0xfc0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x020000>;
+                       read-only;
+               };
 
-       nvram@fe0000 {
-               label = "nvram";
-               reg = <0xfe0000 0x020000>;
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0xfc0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@7f0000 {
+                       label = "nvram";
+                       reg = <0xfe0000 0x020000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/a226m.dts b/target/linux/brcm63xx/dts/a226m.dts
index 7c8bdabf71a4cfd3e24eeb5dd6948ef2c7b624da..4918a870131b9a08bc9509b063e71c190430e8a6 100644 (file)
--- a/target/linux/brcm63xx/dts/a226m.dts
+++ b/target/linux/brcm63xx/dts/a226m.dts
@@ -96,20 +96,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x7e0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       nvram@7f0000 {
-               label = "nvram";
-               reg = <0x7f0000 0x010000>;
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x7e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@7f0000 {
+                       label = "nvram";
+                       reg = <0x7f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/a4001n.dts b/target/linux/brcm63xx/dts/a4001n.dts
index db835434d88ef9bafd88d516bda10dd90e752038..d99da824e5ba14a6ac06e1149be3114066a05836 100644 (file)
--- a/target/linux/brcm63xx/dts/a4001n.dts
+++ b/target/linux/brcm63xx/dts/a4001n.dts
@@ -69,25 +69,29 @@
                spi-rx-bus-width = <2>;
                reg = <0>;
 
-               #address-cells = <1>;
-               #size-cells = <1>;
-
                linux,part-probe = "bcm63xxpart";
 
-               cfe@0 {
-                       reg = <0x000000 0x010000>;
-                       label = "cfe";
-                       read-only;
-               };
-
-               linux@10000 {
-                       reg = <0x010000 0x7e0000>;
-                       label = "linux";
-               };
-
-               nvram@7f0000 {
-                       reg = <0x7f0000 0x010000>;
-                       label = "nvram";
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       cfe@0 {
+                               reg = <0x000000 0x010000>;
+                               label = "cfe";
+                               read-only;
+                       };
+
+                       linux@10000 {
+                               reg = <0x010000 0x7e0000>;
+                               label = "linux";
+                               compatible = "brcm,bcm963xx-imagetag";
+                       };
+
+                       nvram@7f0000 {
+                               reg = <0x7f0000 0x010000>;
+                               label = "nvram";
+                       };
                };
        };
 };

diff --git a/target/linux/brcm63xx/dts/a4001n1.dts b/target/linux/brcm63xx/dts/a4001n1.dts
index ad1590d7a0c5640e4eb872560b4f2d21f5bbed5a..7306e90275f247ad32df6707a83002ef37ae4153 100644 (file)
--- a/target/linux/brcm63xx/dts/a4001n1.dts
+++ b/target/linux/brcm63xx/dts/a4001n1.dts
@@ -102,20 +102,27 @@
 
                linux,part-probe = "bcm63xxpart";
 
-               cfe@0 {
-                       reg = <0x000000 0x010000>;
-                       label = "cfe";
-                       read-only;
-               };
-
-               linux@10000 {
-                       reg = <0x010000 0xfe0000>;
-                       label = "linux";
-               };
-
-               nvram@ff0000 {
-                       reg = <0xff0000 0x010000>;
-                       label = "nvram";
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       cfe@0 {
+                               reg = <0x000000 0x010000>;
+                               label = "cfe";
+                               read-only;
+                       };
+
+                       linux@10000 {
+                               reg = <0x010000 0xfe0000>;
+                               label = "linux";
+                               compatible = "brcm,bcm963xx-imagetag";
+                       };
+
+                       nvram@ff0000 {
+                               reg = <0xff0000 0x010000>;
+                               label = "nvram";
+                       };
                };
        };
 };

diff --git a/target/linux/brcm63xx/dts/ad1018-nor.dts b/target/linux/brcm63xx/dts/ad1018-nor.dts
index 7a630a1856481d1a51ace0bde41659d25a3ee911..5ce19db3352a47781461864226a63ac2354dd2a8 100644 (file)
--- a/target/linux/brcm63xx/dts/ad1018-nor.dts
+++ b/target/linux/brcm63xx/dts/ad1018-nor.dts
@@ -133,6 +133,10 @@
                #size-cells = <1>;
 
                linux,part-probe = "bcm63xxpart";
+
+               partitions {
+                       compatible = "brcm,bcm963xx-cfe-nor-partitions";
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/agpf-s0.dts b/target/linux/brcm63xx/dts/agpf-s0.dts
index 6ac3801c38898558a283247b957e3f95be299640..140ebfae9ff41b20db7dc8e476f1856ba5711d57 100644 (file)
--- a/target/linux/brcm63xx/dts/agpf-s0.dts
+++ b/target/linux/brcm63xx/dts/agpf-s0.dts
@@ -100,20 +100,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x020000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@20000 {
-               label = "linux";
-               reg = <0x020000 0xfc0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x020000>;
+                       read-only;
+               };
 
-       nvram@fe0000 {
-               label = "nvram";
-               reg = <0xfe0000 0x020000>;
+               linux@20000 {
+                       label = "linux";
+                       reg = <0x020000 0xfc0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@fe0000 {
+                       label = "nvram";
+                       reg = <0xfe0000 0x020000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/ar-5315u.dts b/target/linux/brcm63xx/dts/ar-5315u.dts
index e359fe4ebbdb9621d25e21c84ec453db1a19cced..5c5d7c6dd5b94479bd31a6c3552bdf299de1093c 100644 (file)
--- a/target/linux/brcm63xx/dts/ar-5315u.dts
+++ b/target/linux/brcm63xx/dts/ar-5315u.dts
@@ -82,20 +82,28 @@
 
                linux,part-probe = "bcm63xxpart";
 
-               cfe@0 {
-                       reg = <0x000000 0x010000>;
-                       label = "cfe";
-                       read-only;
-               };
-
-               linux@10000 {
-                       reg = <0x010000 0xfe0000>;
-                       label = "linux";
-               };
 
-               nvram@ff0000 {
-                       reg = <0xff0000 0x010000>;
-                       label = "nvram";
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       cfe@0 {
+                               reg = <0x000000 0x010000>;
+                               label = "cfe";
+                               read-only;
+                       };
+
+                       linux@10000 {
+                               reg = <0x010000 0xfe0000>;
+                               label = "linux";
+                               compatible = "brcm,bcm963xx-imagetag";
+                       };
+
+                       nvram@ff0000 {
+                               reg = <0xff0000 0x010000>;
+                               label = "nvram";
+                       };
                };
        };
 };

diff --git a/target/linux/brcm63xx/dts/ar-5381u.dts b/target/linux/brcm63xx/dts/ar-5381u.dts
index 9da5b7e3cdf17fc872abd5b31574570060fec2bf..c3ed00a5f45eaac7781d3d160052a8f816789f16 100644 (file)
--- a/target/linux/brcm63xx/dts/ar-5381u.dts
+++ b/target/linux/brcm63xx/dts/ar-5381u.dts
@@ -61,20 +61,27 @@
 
                linux,part-probe = "bcm63xxpart";
 
-               cfe@0 {
-                       reg = <0x000000 0x010000>;
-                       label = "cfe";
-                       read-only;
-               };
-
-               linux@10000 {
-                       reg = <0x010000 0xfe0000>;
-                       label = "linux";
-               };
-
-               nvram@ff0000 {
-                       reg = <0xff0000 0x010000>;
-                       label = "nvram";
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       cfe@0 {
+                               reg = <0x000000 0x010000>;
+                               label = "cfe";
+                               read-only;
+                       };
+
+                       linux@10000 {
+                               reg = <0x010000 0xfe0000>;
+                               label = "linux";
+                               compatible = "brcm,bcm963xx-imagetag";
+                       };
+
+                       nvram@ff0000 {
+                               reg = <0xff0000 0x010000>;
+                               label = "nvram";
+                       };
                };
        };
 };

diff --git a/target/linux/brcm63xx/dts/ar-5387un.dts b/target/linux/brcm63xx/dts/ar-5387un.dts
index 4dd71459fc055f160a4105b6a7cfd986d4645e9b..9b54fda74dd56d150c39eea031e29294e369554b 100644 (file)
--- a/target/linux/brcm63xx/dts/ar-5387un.dts
+++ b/target/linux/brcm63xx/dts/ar-5387un.dts
@@ -69,20 +69,27 @@
 
                linux,part-probe = "bcm63xxpart";
 
-               cfe@0 {
-                       reg = <0x000000 0x010000>;
-                       label = "cfe";
-                       read-only;
-               };
-
-               linux@10000 {
-                       reg = <0x010000 0xfe0000>;
-                       label = "linux";
-               };
-
-               nvram@ff0000 {
-                       reg = <0xff0000 0x010000>;
-                       label = "nvram";
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       cfe@0 {
+                               reg = <0x000000 0x010000>;
+                               label = "cfe";
+                               read-only;
+                       };
+
+                       linux@10000 {
+                               reg = <0x010000 0xfe0000>;
+                               label = "linux";
+                               compatible = "brcm,bcm963xx-imagetag";
+                       };
+
+                       nvram@ff0000 {
+                               reg = <0xff0000 0x010000>;
+                               label = "nvram";
+                       };
                };
        };
 };

diff --git a/target/linux/brcm63xx/dts/ar1004g.dts b/target/linux/brcm63xx/dts/ar1004g.dts
index e7265f4d4bee1cd64d58a782c20e28e3e0a7d254..600245c63a76ed5e658b7341a0f760476b741dd4 100644 (file)
--- a/target/linux/brcm63xx/dts/ar1004g.dts
+++ b/target/linux/brcm63xx/dts/ar1004g.dts
@@ -51,20 +51,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x3e0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       nvram@3f0000 {
-               label = "nvram";
-               reg = <0x3f0000 0x010000>;
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x3e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@3f0000 {
+                       label = "nvram";
+                       reg = <0x3f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/av4202n.dts b/target/linux/brcm63xx/dts/av4202n.dts
index ef61607882d26d85e7adb7e4243bbf8adfbd39b2..138d8c0ff1de220356cf27e66d91b0148d44b5fd 100644 (file)
--- a/target/linux/brcm63xx/dts/av4202n.dts
+++ b/target/linux/brcm63xx/dts/av4202n.dts
@@ -73,20 +73,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x020000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@20000 {
-               label = "linux";
-               reg = <0x020000 0xfc0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x020000>;
+                       read-only;
+               };
 
-       nvram@fe0000 {
-               label = "nvram";
-               reg = <0xfe0000 0x020000>;
+               linux@20000 {
+                       label = "linux";
+                       reg = <0x020000 0xfc0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@fe0000 {
+                       label = "nvram";
+                       reg = <0xfe0000 0x020000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/bcm96318ref.dts b/target/linux/brcm63xx/dts/bcm96318ref.dts
index e48c0bf46e0cc7083a8cc04d8071d7d80db94807..2d19eeaeeec412183953aaa1aebb4c7b95b163df 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm96318ref.dts
+++ b/target/linux/brcm63xx/dts/bcm96318ref.dts
@@ -67,6 +67,10 @@
                #size-cells = <1>;
 
                linux,part-probe = "bcm63xxpart";
+
+               partitions {
+                       compatible = "brcm,bcm963xx-cfe-nor-partitions";
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/bcm96318ref_p300.dts b/target/linux/brcm63xx/dts/bcm96318ref_p300.dts
index db9d5eccd67b935ad2a7927a591d0ca82b832607..fb8ad78512b4bd9d0f2809a5aaa2ebd1d10f7312 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm96318ref_p300.dts
+++ b/target/linux/brcm63xx/dts/bcm96318ref_p300.dts
@@ -73,6 +73,10 @@
                #size-cells = <1>;
 
                linux,part-probe = "bcm63xxpart";
+
+               partitions {
+                       compatible = "brcm,bcm963xx-cfe-nor-partitions";
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/bcm963268bu_p300.dts b/target/linux/brcm63xx/dts/bcm963268bu_p300.dts
index 2bccb57a98472e7375d01068bcbef9f6fd92146c..2c9875644ae192cf2e475f2971e89c84162c4d5e 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm963268bu_p300.dts
+++ b/target/linux/brcm63xx/dts/bcm963268bu_p300.dts
@@ -48,6 +48,10 @@
                #size-cells = <1>;
 
                linux,part-probe = "bcm63xxpart";
+
+               partitions {
+                       compatible = "brcm,bcm963xx-cfe-nor-partitions";
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/bcm963269bhr.dts b/target/linux/brcm63xx/dts/bcm963269bhr.dts
index d3c709877b5f3bb4606a23c527f0a51026e1b6af..ad31adfdfe8aec7438687779e32463ce441ae607 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm963269bhr.dts
+++ b/target/linux/brcm63xx/dts/bcm963269bhr.dts
@@ -56,6 +56,10 @@
                #size-cells = <1>;
 
                linux,part-probe = "bcm63xxpart";
+
+               partitions {
+                       compatible = "brcm,bcm963xx-cfe-nor-partitions";
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/bcm963281TAN.dts b/target/linux/brcm63xx/dts/bcm963281TAN.dts
index d0d19a3550d4c42987c728a8fd0a25284c3546ee..b280cb0bc1ccc86abb9a0fef900b8a44a504ab63 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm963281TAN.dts
+++ b/target/linux/brcm63xx/dts/bcm963281TAN.dts
@@ -58,6 +58,10 @@
                #size-cells = <1>;
 
                linux,part-probe = "bcm63xxpart";
+
+               partitions {
+                       compatible = "brcm,bcm963xx-cfe-nor-partitions";
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/bcm96328avng.dts b/target/linux/brcm63xx/dts/bcm96328avng.dts
index d0d67880e474a8c2edff7bcb55aec6ae014b42ad..24e658e8d2a89aea864ba4b39dc02c71447a4229 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm96328avng.dts
+++ b/target/linux/brcm63xx/dts/bcm96328avng.dts
@@ -58,6 +58,10 @@
                #size-cells = <1>;
 
                linux,part-probe = "bcm63xxpart";
+
+               partitions {
+                       compatible = "brcm,bcm963xx-cfe-nor-partitions";
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/bcm96338GW.dts b/target/linux/brcm63xx/dts/bcm96338GW.dts
index d6ff449d312ae001cbd42a307bcb16c59773c6f3..741a695af39a9f17f67a4ddc722c8cacb88f132e 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm96338GW.dts
+++ b/target/linux/brcm63xx/dts/bcm96338GW.dts
@@ -44,6 +44,10 @@
        status = "ok";
 
        linux,part-probe = "bcm63xxpart";
+
+       partitions {
+               compatible = "brcm,bcm963xx-cfe-nor-partitions";
+       };
 };
 
 &uart0 {

diff --git a/target/linux/brcm63xx/dts/bcm96338W.dts b/target/linux/brcm63xx/dts/bcm96338W.dts
index f91ca9a39945e822d1dcdacf09203f6b20e5da8f..674b3993c9740e5f5e2a59707a48431288cd3a96 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm96338W.dts
+++ b/target/linux/brcm63xx/dts/bcm96338W.dts
@@ -44,6 +44,10 @@
        status = "ok";
 
        linux,part-probe = "bcm63xxpart";
+
+       partitions {
+               compatible = "brcm,bcm963xx-cfe-nor-partitions";
+       };
 };
 
 &uart0 {

diff --git a/target/linux/brcm63xx/dts/bcm96345GW2.dts b/target/linux/brcm63xx/dts/bcm96345GW2.dts
index a7b3fad136060e805517c50c5b90a086ab1df85b..e329b019278dce026cf577b9b877614f68bb6dd2 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm96345GW2.dts
+++ b/target/linux/brcm63xx/dts/bcm96345GW2.dts
@@ -18,6 +18,10 @@
        status = "ok";
 
        linux,part-probe = "bcm63xxpart";
+
+       partitions {
+               compatible = "brcm,bcm963xx-cfe-nor-partitions";
+       };
 };
 
 &uart0 {

diff --git a/target/linux/brcm63xx/dts/bcm96348GW-10.dts b/target/linux/brcm63xx/dts/bcm96348GW-10.dts
index 59850b5a1026107594f65ab0a52dc24993c8f499..742fefd28daa26182d42d49d02a43532868ae625 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm96348GW-10.dts
+++ b/target/linux/brcm63xx/dts/bcm96348GW-10.dts
@@ -58,6 +58,10 @@
        status = "ok";
 
        linux,part-probe = "bcm63xxpart";
+
+       partitions {
+               compatible = "brcm,bcm963xx-cfe-nor-partitions";
+       };
 };
 
 &pinctrl {

diff --git a/target/linux/brcm63xx/dts/bcm96348GW-11.dts b/target/linux/brcm63xx/dts/bcm96348GW-11.dts
index 3caca09707e4af3183ae9acbc22c93ce3d36a6ae..30f77d9c08b1a3bb5b6a0b400e50bfea186078e8 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm96348GW-11.dts
+++ b/target/linux/brcm63xx/dts/bcm96348GW-11.dts
@@ -58,6 +58,10 @@
        status = "ok";
 
        linux,part-probe = "bcm63xxpart";
+
+       partitions {
+               compatible = "brcm,bcm963xx-cfe-nor-partitions";
+       };
 };
 
 &pinctrl {

diff --git a/target/linux/brcm63xx/dts/bcm96348GW.dts b/target/linux/brcm63xx/dts/bcm96348GW.dts
index c213ac7a1f1d4a41c510ca78f70f4aea5611695c..0713cec714e716b73517e3f69df99b42a07871da 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm96348GW.dts
+++ b/target/linux/brcm63xx/dts/bcm96348GW.dts
@@ -58,6 +58,10 @@
        status = "ok";
 
        linux,part-probe = "bcm63xxpart";
+
+       partitions {
+               compatible = "brcm,bcm963xx-cfe-nor-partitions";
+       };
 };
 
 &pinctrl {

diff --git a/target/linux/brcm63xx/dts/bcm96348R.dts b/target/linux/brcm63xx/dts/bcm96348R.dts
index b56869b3e465531564247cab243a196e23bfc749..b15c6ccc0ca5374784d8a3d9e372ea312ebc8079 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm96348R.dts
+++ b/target/linux/brcm63xx/dts/bcm96348R.dts
@@ -44,6 +44,10 @@
        status = "ok";
 
        linux,part-probe = "bcm63xxpart";
+
+       partitions {
+               compatible = "brcm,bcm963xx-cfe-nor-partitions";
+       };
 };
 
 &pinctrl {

diff --git a/target/linux/brcm63xx/dts/bcm96358VW.dts b/target/linux/brcm63xx/dts/bcm96358VW.dts
index e097c0518ee3103f3b15201f1d87b4cc90fdd21b..ca9238829aa364b85455ea7255c33dc9c729d1fa 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm96358VW.dts
+++ b/target/linux/brcm63xx/dts/bcm96358VW.dts
@@ -44,6 +44,10 @@
        status = "ok";
 
        linux,part-probe = "bcm63xxpart";
+
+       partitions {
+               compatible = "brcm,bcm963xx-cfe-nor-partitions";
+       };
 };
 
 &uart0 {

diff --git a/target/linux/brcm63xx/dts/bcm96358VW2.dts b/target/linux/brcm63xx/dts/bcm96358VW2.dts
index 5c242c2157ba2f51914807aad6a4e3b3f5dcff14..8eebd1c4248369a13d0cc6aee3b6d584925b8c91 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm96358VW2.dts
+++ b/target/linux/brcm63xx/dts/bcm96358VW2.dts
@@ -40,6 +40,10 @@
        status = "ok";
 
        linux,part-probe = "bcm63xxpart";
+
+       partitions {
+               compatible = "brcm,bcm963xx-cfe-nor-partitions";
+       };
 };
 
 &uart0 {

diff --git a/target/linux/brcm63xx/dts/bcm96368MVNgr.dts b/target/linux/brcm63xx/dts/bcm96368MVNgr.dts
index 6c4ef091ac792b25f880919c29289d4cb4274cdb..0b1773d27d48e3ea3dc26f46a356162dd2ad074a 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm96368MVNgr.dts
+++ b/target/linux/brcm63xx/dts/bcm96368MVNgr.dts
@@ -44,6 +44,10 @@
        status = "ok";
 
        linux,part-probe = "bcm63xxpart";
+
+       partitions {
+               compatible = "brcm,bcm963xx-cfe-nor-partitions";
+       };
 };
 
 &pinctrl {

diff --git a/target/linux/brcm63xx/dts/bcm96368MVWG.dts b/target/linux/brcm63xx/dts/bcm96368MVWG.dts
index ed1dd90160b55d52ffb83acd6b87e888ab07d7dd..172abd2cf7fa09c30867d9820a37cb3050a7f354 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm96368MVWG.dts
+++ b/target/linux/brcm63xx/dts/bcm96368MVWG.dts
@@ -44,6 +44,10 @@
        status = "ok";
 
        linux,part-probe = "bcm63xxpart";
+
+       partitions {
+               compatible = "brcm,bcm963xx-cfe-nor-partitions";
+       };
 };
 
 &pinctrl {

diff --git a/target/linux/brcm63xx/dts/cpva502plus.dts b/target/linux/brcm63xx/dts/cpva502plus.dts
index 6d8455e91c93fc3bbafb7b970ac5c11f31cc58ec..023970acabbade98c3a39f3e92e384e48ad866d7 100644 (file)
--- a/target/linux/brcm63xx/dts/cpva502plus.dts
+++ b/target/linux/brcm63xx/dts/cpva502plus.dts
@@ -47,20 +47,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x3e0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       nvram@3f0000 {
-               label = "nvram";
-               reg = <0x3f0000 0x010000>;
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x3e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@3f0000 {
+                       label = "nvram";
+                       reg = <0x3f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/cpva642.dts b/target/linux/brcm63xx/dts/cpva642.dts
index 212bf6c32a6f6f44419bfbacc0fd9074fd6b919b..ba0426ae552d291d0c580bbe35834430f914173f 100644 (file)
--- a/target/linux/brcm63xx/dts/cpva642.dts
+++ b/target/linux/brcm63xx/dts/cpva642.dts
@@ -84,20 +84,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x7e0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       nvram@7f0000 {
-               label = "nvram";
-               reg = <0x7f0000 0x010000>;
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x7e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@7f0000 {
+                       label = "nvram";
+                       reg = <0x7f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/ct-5365.dts b/target/linux/brcm63xx/dts/ct-5365.dts
index ac3b80954fb660c4bc3ced358342e08e691daca4..3598f912ccd552d64248bce5a080750881a37ea2 100644 (file)
--- a/target/linux/brcm63xx/dts/ct-5365.dts
+++ b/target/linux/brcm63xx/dts/ct-5365.dts
@@ -61,20 +61,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x3e0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       nvram@3f0000 {
-               label = "nvram";
-               reg = <0x3f0000 0x010000>;
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x3e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@3f0000 {
+                       label = "nvram";
+                       reg = <0x3f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/ct-6373.dts b/target/linux/brcm63xx/dts/ct-6373.dts
index 579b514f93dc602d823d28a43066efe2a233ccc6..e6069bcd067e818e34d3f370a0432dc7542865f7 100644 (file)
--- a/target/linux/brcm63xx/dts/ct-6373.dts
+++ b/target/linux/brcm63xx/dts/ct-6373.dts
@@ -82,20 +82,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x7e0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       nvram@7f0000 {
-               label = "nvram";
-               reg = <0x7f0000 0x010000>;
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x7e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@7f0000 {
+                       label = "nvram";
+                       reg = <0x7f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/ct536plus.dts b/target/linux/brcm63xx/dts/ct536plus.dts
index f9bc7e136c7d3d5e57c7b4e98eff48fa04bed882..9c075a54ce958556037bcac5a3e0e0f52c79896d 100644 (file)
--- a/target/linux/brcm63xx/dts/ct536plus.dts
+++ b/target/linux/brcm63xx/dts/ct536plus.dts
@@ -47,20 +47,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x3e0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       nvram@3f0000 {
-               label = "nvram";
-               reg = <0x3f0000 0x010000>;
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x3e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@3f0000 {
+                       label = "nvram";
+                       reg = <0x3f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/cvg834g.dts b/target/linux/brcm63xx/dts/cvg834g.dts
index fa14c8bbd9512569adde79d4be29bb8e2b83fef3..ad71eb39989ded49813ffca93709a22f29cbe232 100644 (file)
--- a/target/linux/brcm63xx/dts/cvg834g.dts
+++ b/target/linux/brcm63xx/dts/cvg834g.dts
@@ -29,20 +29,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x3e0000>;
-       };
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x3e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
 
-       nvram@3f0000 {
-               label = "nvram";
-               reg = <0x3f0000 0x010000>;
+               nvram@3f0000 {
+                       label = "nvram";
+                       reg = <0x3f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/dg834g_v4.dts b/target/linux/brcm63xx/dts/dg834g_v4.dts
index 369a67c2220ba8dd3ddb1b97d7dccb19eaeaffd6..019fe49e279e7144b5d6102c681221cb76ebf23d 100644 (file)
--- a/target/linux/brcm63xx/dts/dg834g_v4.dts
+++ b/target/linux/brcm63xx/dts/dg834g_v4.dts
@@ -55,20 +55,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x3e0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       nvram@3f0000 {
-               label = "nvram";
-               reg = <0x3f0000 0x010000>;
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x3e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@3f0000 {
+                       label = "nvram";
+                       reg = <0x3f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/dg834gtpn.dts b/target/linux/brcm63xx/dts/dg834gtpn.dts
index 794c701dadcbbc88cbb6a062bcec0ddb1cc478b0..694af6ad5b07c506841137a05874aa4417b0b977 100644 (file)
--- a/target/linux/brcm63xx/dts/dg834gtpn.dts
+++ b/target/linux/brcm63xx/dts/dg834gtpn.dts
@@ -59,20 +59,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x3e0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       nvram@3f0000 {
-               label = "nvram";
-               reg = <0x3f0000 0x010000>;
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x3e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@3f0000 {
+                       label = "nvram";
+                       reg = <0x3f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/dgnd3700v1.dts b/target/linux/brcm63xx/dts/dgnd3700v1.dts
index 2d23f19b7ad83aebebb7298868e5506d114a3c5d..3a556b3562a64151cc5a710c851281057ab1f2e7 100644 (file)
--- a/target/linux/brcm63xx/dts/dgnd3700v1.dts
+++ b/target/linux/brcm63xx/dts/dgnd3700v1.dts
@@ -93,26 +93,33 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x020000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@20000 {
-               label = "linux";
-               reg = <0x020000 0x1e20000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x020000>;
+                       read-only;
+               };
 
-       board_data@1e40000 {
-               label = "board_data";
-               reg = <0x1e40000 0x1a0000>;
-               read-only;
-       };
+               linux@20000 {
+                       label = "linux";
+                       reg = <0x020000 0x1e20000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               board_data@1e40000 {
+                       label = "board_data";
+                       reg = <0x1e40000 0x1a0000>;
+                       read-only;
+               };
 
-       nvram@1fe0000 {
-               label = "nvram";
-               reg = <0x1fe0000 0x20000>;
+               nvram@1fe0000 {
+                       label = "nvram";
+                       reg = <0x1fe0000 0x20000>;
+               };
        };
 }; 
 

diff --git a/target/linux/brcm63xx/dts/dsl-2640b-b.dts b/target/linux/brcm63xx/dts/dsl-2640b-b.dts
index df7f4adc0765e6239e7d37bbf144d5e02d11a900..0acb5c6e76a07a541de3fd19ae128747600a1734 100644 (file)
--- a/target/linux/brcm63xx/dts/dsl-2640b-b.dts
+++ b/target/linux/brcm63xx/dts/dsl-2640b-b.dts
@@ -55,20 +55,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x3e0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       nvram@3f0000 {
-               label = "nvram";
-               reg = <0x3f0000 0x010000>;
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x3e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@3f0000 {
+                       label = "nvram";
+                       reg = <0x3f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/dsl-2640u.dts b/target/linux/brcm63xx/dts/dsl-2640u.dts
index 8fea2acb254e37b6d94a5112ef7f9976f0143d50..e6d1819257ad39dd823e170aff4bf7a5cdd610c5 100644 (file)
--- a/target/linux/brcm63xx/dts/dsl-2640u.dts
+++ b/target/linux/brcm63xx/dts/dsl-2640u.dts
@@ -39,20 +39,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x3e0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       nvram@3f0000 {
-               label = "nvram";
-               reg = <0x3f0000 0x010000>;
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x3e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@3f0000 {
+                       label = "nvram";
+                       reg = <0x3f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/dsl-2650u.dts b/target/linux/brcm63xx/dts/dsl-2650u.dts
index c9b189b8b0da539e5f4a2a44643800ec24ea125e..22b1d52417ee64cc9ce5dd98b3b771d2aa8e6b4f 100644 (file)
--- a/target/linux/brcm63xx/dts/dsl-2650u.dts
+++ b/target/linux/brcm63xx/dts/dsl-2650u.dts
@@ -41,20 +41,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x7e0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       nvram@7f0000 {
-               label = "nvram";
-               reg = <0x7f0000 0x010000>;
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x7e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@7f0000 {
+                       label = "nvram";
+                       reg = <0x7f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/dsl-274xb-c.dts b/target/linux/brcm63xx/dts/dsl-274xb-c.dts
index 3468dea8b3a40fd537e731a5bb0e8eb15e362ce3..bab04271e79c650b934c33f438aa2abdceb410dd 100644 (file)
--- a/target/linux/brcm63xx/dts/dsl-274xb-c.dts
+++ b/target/linux/brcm63xx/dts/dsl-274xb-c.dts
@@ -59,20 +59,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x3e0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       nvram@3f0000 {
-               label = "nvram";
-               reg = <0x3f0000 0x010000>;
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x3e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@3f0000 {
+                       label = "nvram";
+                       reg = <0x3f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/dsl-274xb-f.dts b/target/linux/brcm63xx/dts/dsl-274xb-f.dts
index 00a5a9e99a0502acfc103a71d3c76882024aa6c8..8555bb4f2cb49cb06a718942db067ec9ca9c623a 100644 (file)
--- a/target/linux/brcm63xx/dts/dsl-274xb-f.dts
+++ b/target/linux/brcm63xx/dts/dsl-274xb-f.dts
@@ -83,26 +83,33 @@
 
                linux,part-probe = "bcm63xxpart";
 
-               cfe@0 {
-                       reg = <0x000000 0x010000>;
-                       label = "cfe";
-                       read-only;
-               };
-
-               linux@10000 {
-                       reg = <0x010000 0x7c0000>;
-                       label = "linux";
-               };
-
-               cal_data@7d0000 {
-                       reg = <0x7d0000 0x010000>;
-                       label = "cal_data";
-                       read-only;
-               };
-
-               nvram@7e0000 {
-                       reg = <0x7e0000 0x020000>;
-                       label = "nvram";
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       cfe@0 {
+                               reg = <0x000000 0x010000>;
+                               label = "cfe";
+                               read-only;
+                       };
+
+                       linux@10000 {
+                               reg = <0x010000 0x7c0000>;
+                               label = "linux";
+                               compatible = "brcm,bcm963xx-imagetag";
+                       };
+
+                       cal_data@7d0000 {
+                               reg = <0x7d0000 0x010000>;
+                               label = "cal_data";
+                               read-only;
+                       };
+
+                       nvram@7e0000 {
+                               reg = <0x7e0000 0x020000>;
+                               label = "nvram";
+                       };
                };
        };
 };

diff --git a/target/linux/brcm63xx/dts/dsl-275xb-d.dts b/target/linux/brcm63xx/dts/dsl-275xb-d.dts
index d8f8c08e1ea6ebbf9db7c4fbc1eade7ce71bf1b2..c801fcab26613b54b8d9609d4f89b3d393f3ab37 100644 (file)
--- a/target/linux/brcm63xx/dts/dsl-275xb-d.dts
+++ b/target/linux/brcm63xx/dts/dsl-275xb-d.dts
@@ -96,20 +96,27 @@
 
                linux,part-probe = "bcm63xxpart";
 
-               cfe@0 {
-                       reg = <0x000000 0x010000>;
-                       label = "cfe";
-                       read-only;
-               };
-
-               linux@10000 {
-                       reg = <0x010000 0x7e0000>;
-                       label = "linux";
-               };
-
-               nvram@7f0000 {
-                       reg = <0x7f0000 0x010000>;
-                       label = "nvram";
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       cfe@0 {
+                               reg = <0x000000 0x010000>;
+                               label = "cfe";
+                               read-only;
+                       };
+
+                       linux@10000 {
+                               reg = <0x010000 0x7e0000>;
+                               label = "linux";
+                               compatible = "brcm,bcm963xx-imagetag";
+                       };
+
+                       nvram@7f0000 {
+                               reg = <0x7f0000 0x010000>;
+                               label = "nvram";
+                       };
                };
        };
 };

diff --git a/target/linux/brcm63xx/dts/dv-201amr.dts b/target/linux/brcm63xx/dts/dv-201amr.dts
index 42a825f923f92bb851f438283845e4d04c814f0f..c13093228d2ffb857dd198b721aab73c0e41bfcf 100644 (file)
--- a/target/linux/brcm63xx/dts/dv-201amr.dts
+++ b/target/linux/brcm63xx/dts/dv-201amr.dts
@@ -19,20 +19,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       backup@0 {
-               label = "backup";
-               reg = <0x000000 0x400000>;
-       };
-
-       cfe@400000 {
-               label = "cfe";
-               reg = <0x400000 0x010000>;
-               read-only;
-       };
-
-       linux@410000 {
-               label = "linux";
-               reg = <0x410000 0x3f0000>;
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               backup@0 {
+                       label = "backup";
+                       reg = <0x000000 0x400000>;
+               };
+
+               cfe@400000 {
+                       label = "cfe";
+                       reg = <0x400000 0x010000>;
+                       read-only;
+               };
+
+               linux@410000 {
+                       label = "linux";
+                       reg = <0x410000 0x3f0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts b/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts
index 2945165ce175ee14f5ca01bd0e2a8b8bfddcdf5f..3478657f19d808d5c737af28e944c54fdad0335f 100644 (file)
--- a/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts
+++ b/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts
@@ -59,20 +59,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x7e0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       nvram@7f0000 {
-               label = "nvram";
-               reg = <0x7f0000 0x010000>;
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x7e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@7f0000 {
+                       label = "nvram";
+                       reg = <0x7f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/evg2000.dts b/target/linux/brcm63xx/dts/evg2000.dts
index 10e0ddcc93cd9a8ed2ac15e0fc477653ab05b2c1..2d254fb03c588bf509b7d743434359a19b44171e 100644 (file)
--- a/target/linux/brcm63xx/dts/evg2000.dts
+++ b/target/linux/brcm63xx/dts/evg2000.dts
@@ -84,26 +84,33 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x00000000 0x00020000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@20000 {
-               label = "linux";
-               reg = <0x00020000 0x00f40000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x00000000 0x00020000>;
+                       read-only;
+               };
 
-       board_data@f60000 {
-               label = "board_data";
-               reg = <0x00f60000 0x00080000>;
-               read-only;
-       };
+               linux@20000 {
+                       label = "linux";
+                       reg = <0x00020000 0x00f40000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               board_data@f60000 {
+                       label = "board_data";
+                       reg = <0x00f60000 0x00080000>;
+                       read-only;
+               };
 
-       nvram@fe0000 {
-               label = "nvram";
-               reg = <0x00fe0000 0x00020000>;
+               nvram@fe0000 {
+                       label = "nvram";
+                       reg = <0x00fe0000 0x00020000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/f5d7633.dts b/target/linux/brcm63xx/dts/f5d7633.dts
index 89c646b9230ea6cac58ce569c8fdfeb4f061362a..621ef0b3e1e9a3563b2d1f0ac6a2313c82d58313 100644 (file)
--- a/target/linux/brcm63xx/dts/f5d7633.dts
+++ b/target/linux/brcm63xx/dts/f5d7633.dts
@@ -59,20 +59,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x020000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@20000 {
-               label = "linux";
-               reg = <0x020000 0x3c0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x020000>;
+                       read-only;
+               };
 
-       nvram@3e0000 {
-               label = "nvram";
-               reg = <0x3e0000 0x020000>;
+               linux@20000 {
+                       label = "linux";
+                       reg = <0x020000 0x3c0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@3e0000 {
+                       label = "nvram";
+                       reg = <0x3e0000 0x020000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/fast2404.dts b/target/linux/brcm63xx/dts/fast2404.dts
index c0a30a08eadf193bfc360a95b33e57bec72668f7..8fde61621a1d4de1efbe33a610b0254834415122 100644 (file)
--- a/target/linux/brcm63xx/dts/fast2404.dts
+++ b/target/linux/brcm63xx/dts/fast2404.dts
@@ -19,20 +19,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
-
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x3e0000>;
-       };
-
-       nvram@3f0000 {
-               label = "nvram";
-               reg = <0x3f0000 0x010000>;
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
+
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x3e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@3f0000 {
+                       label = "nvram";
+                       reg = <0x3f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/fast2504n.dts b/target/linux/brcm63xx/dts/fast2504n.dts
index 8b644fb8f1fd5fc4d20c85ccd9dfa7450d9f2b61..bb0d98c3144448df2b547f9eac78036c42452c30 100644 (file)
--- a/target/linux/brcm63xx/dts/fast2504n.dts
+++ b/target/linux/brcm63xx/dts/fast2504n.dts
@@ -78,20 +78,27 @@
 
                linux,part-probe = "bcm63xxpart";
 
-               cfe@0 {
-                       reg = <0x000000 0x010000>;
-                       label = "cfe";
-                       read-only;
-               };
-
-               linux@10000 {
-                       reg = <0x010000 0x7e0000>;
-                       label = "linux";
-               };
-
-               nvram@7f0000 {
-                       reg = <0x7f0000 0x010000>;
-                       label = "nvram";
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       cfe@0 {
+                               reg = <0x000000 0x010000>;
+                               label = "cfe";
+                               read-only;
+                       };
+
+                       linux@10000 {
+                               reg = <0x010000 0x7e0000>;
+                               label = "linux";
+                               compatible = "brcm,bcm963xx-imagetag";
+                       };
+
+                       nvram@7f0000 {
+                               reg = <0x7f0000 0x010000>;
+                               label = "nvram";
+                       };
                };
        };
 };

diff --git a/target/linux/brcm63xx/dts/fast2604.dts b/target/linux/brcm63xx/dts/fast2604.dts
index 14339408bc2666d199349be1c37201c3c5756ed5..5515504fb95d1a818678dab89c0de6f46c27e512 100644 (file)
--- a/target/linux/brcm63xx/dts/fast2604.dts
+++ b/target/linux/brcm63xx/dts/fast2604.dts
@@ -55,20 +55,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x3e0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       nvram@3f0000 {
-               label = "nvram";
-               reg = <0x3f0000 0x010000>;
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x3e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@3f0000 {
+                       label = "nvram";
+                       reg = <0x3f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/fast2704n.dts b/target/linux/brcm63xx/dts/fast2704n.dts
index 217ef12d7cbdc6ecf8de854edf618f04e2bfba52..079f15994993f0c7ec3bd23200b557caefd4d1be 100644 (file)
--- a/target/linux/brcm63xx/dts/fast2704n.dts
+++ b/target/linux/brcm63xx/dts/fast2704n.dts
@@ -103,20 +103,27 @@
 
                linux,part-probe = "bcm63xxpart";
 
-               cfe@0 {
-                       reg = <0x000000 0x010000>;
-                       label = "cfe";
-                       read-only;
-               };
-
-               linux@10000 {
-                       reg = <0x010000 0x7e0000>;
-                       label = "linux";
-               };
-
-               nvram@7f0000 {
-                       reg = <0x7f0000 0x010000>;
-                       label = "nvram";
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       cfe@0 {
+                               reg = <0x000000 0x010000>;
+                               label = "cfe";
+                               read-only;
+                       };
+
+                       linux@10000 {
+                               reg = <0x010000 0x7e0000>;
+                               label = "linux";
+                               compatible = "brcm,bcm963xx-imagetag";
+                       };
+
+                       nvram@7f0000 {
+                               reg = <0x7f0000 0x010000>;
+                               label = "nvram";
+                       };
                };
        };
 };

diff --git a/target/linux/brcm63xx/dts/fast2704v2.dts b/target/linux/brcm63xx/dts/fast2704v2.dts
index eeed6b1dae7980ac562c0fc6299f3ffbc07ba914..8cb1c05d4092367f0bd2d6bbf7ae3ce16dd92be1 100644 (file)
--- a/target/linux/brcm63xx/dts/fast2704v2.dts
+++ b/target/linux/brcm63xx/dts/fast2704v2.dts
@@ -87,20 +87,27 @@
 
                linux,part-probe = "bcm63xxpart";
 
-               cfe@0 {
-                       reg = <0x000000 0x010000>;
-                       label = "cfe";
-                       read-only;
-               };
-
-               linux@10000 {
-                       reg = <0x010000 0x7e0000>;
-                       label = "linux";
-               };
-
-               nvram@7f0000 {
-                       reg = <0x7f0000 0x010000>;
-                       label = "nvram";
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       cfe@0 {
+                               reg = <0x000000 0x010000>;
+                               label = "cfe";
+                               read-only;
+                       };
+
+                       linux@10000 {
+                               reg = <0x010000 0x7e0000>;
+                               label = "linux";
+                               compatible = "brcm,bcm963xx-imagetag";
+                       };
+
+                       nvram@7f0000 {
+                               reg = <0x7f0000 0x010000>;
+                               label = "nvram";
+                       };
                };
        };
 };

diff --git a/target/linux/brcm63xx/dts/gw6000.dts b/target/linux/brcm63xx/dts/gw6000.dts
index 31555b3ad2f8a10097df576a95a7638f8c26e40e..ea7deaaa1277d8e5c3f28017ecceb99cabbba352 100644 (file)
--- a/target/linux/brcm63xx/dts/gw6000.dts
+++ b/target/linux/brcm63xx/dts/gw6000.dts
@@ -33,20 +33,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x3e0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       nvram@3f0000 {
-               label = "nvram";
-               reg = <0x3f0000 0x010000>;
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x3e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@3f0000 {
+                       label = "nvram";
+                       reg = <0x3f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/gw6200.dts b/target/linux/brcm63xx/dts/gw6200.dts
index acc100c74747dd99ddab8777617ba9a61b1b58c3..e9523d0e82ac2579dd2db55fea886c34212262e6 100644 (file)
--- a/target/linux/brcm63xx/dts/gw6200.dts
+++ b/target/linux/brcm63xx/dts/gw6200.dts
@@ -54,20 +54,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x7e0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       nvram@7f0000 {
-               label = "nvram";
-               reg = <0x7f0000 0x010000>;
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x7e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@7f0000 {
+                       label = "nvram";
+                       reg = <0x7f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/hg520v.dts b/target/linux/brcm63xx/dts/hg520v.dts
index bfd30693c09876433dd447ab6cacf8ef806a5617..08312f79d1f30cc65ff8ff187584712d40c49f70 100644 (file)
--- a/target/linux/brcm63xx/dts/hg520v.dts
+++ b/target/linux/brcm63xx/dts/hg520v.dts
@@ -42,20 +42,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+               partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x3e0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       nvram@3f0000 {
-               label = "nvram";
-               reg = <0x3f0000 0x010000>;
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x3e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@3f0000 {
+                       label = "nvram";
+                       reg = <0x3f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/hg553.dts b/target/linux/brcm63xx/dts/hg553.dts
index a459976c4d21c31f92bd77d07470882b4d5b84ed..01f230da1eb6def8755e2d75bd6f3a64377460c2 100644 (file)
--- a/target/linux/brcm63xx/dts/hg553.dts
+++ b/target/linux/brcm63xx/dts/hg553.dts
@@ -81,20 +81,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x020000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@20000 {
-               label = "linux";
-               reg = <0x020000 0xfc0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x020000>;
+                       read-only;
+               };
 
-       nvram@fe0000 {
-               label = "nvram";
-               reg = <0xfe0000 0x020000>;
+               linux@20000 {
+                       label = "linux";
+                       reg = <0x020000 0xfc0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@fe0000 {
+                       label = "nvram";
+                       reg = <0xfe0000 0x020000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/hg556a-a.dts b/target/linux/brcm63xx/dts/hg556a-a.dts
index 906ee611b93002ac9f3c9ac88efab99e3e68a933..bd12fcfacbf91c8ce53c04d26e26aac5c9934343 100644 (file)
--- a/target/linux/brcm63xx/dts/hg556a-a.dts
+++ b/target/linux/brcm63xx/dts/hg556a-a.dts
@@ -107,26 +107,33 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x020000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@20000 {
-               label = "linux";
-               reg = <0x020000 0xec0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x020000>;
+                       read-only;
+               };
 
-       cal_data@ee0000 {
-               label = "cal_data";
-               reg = <0xee0000 0x100000>;
-               read-only;
-       };
+               linux@20000 {
+                       label = "linux";
+                       reg = <0x020000 0xec0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               cal_data@ee0000 {
+                       label = "cal_data";
+                       reg = <0xee0000 0x100000>;
+                       read-only;
+               };
 
-       nvram@fe0000 {
-               label = "nvram";
-               reg = <0xfe0000 0x020000>;
+               nvram@fe0000 {
+                       label = "nvram";
+                       reg = <0xfe0000 0x020000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/hg556a-b.dts b/target/linux/brcm63xx/dts/hg556a-b.dts
index 4285e17bcb1e18f4d8852cb8e5f0f40ad66147bb..e4dc24d6d7866429e25e601280d118df45f43eea 100644 (file)
--- a/target/linux/brcm63xx/dts/hg556a-b.dts
+++ b/target/linux/brcm63xx/dts/hg556a-b.dts
@@ -107,26 +107,33 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x020000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@20000 {
-               label = "linux";
-               reg = <0x020000 0xec0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x020000>;
+                       read-only;
+               };
 
-       cal_data@ee0000 {
-               label = "cal_data";
-               reg = <0xee0000 0x100000>;
-               read-only;
-       };
+               linux@20000 {
+                       label = "linux";
+                       reg = <0x020000 0xec0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               cal_data@ee0000 {
+                       label = "cal_data";
+                       reg = <0xee0000 0x100000>;
+                       read-only;
+               };
 
-       nvram@fe0000 {
-               label = "nvram";
-               reg = <0xfe0000 0x020000>;
+               nvram@fe0000 {
+                       label = "nvram";
+                       reg = <0xfe0000 0x020000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/hg556a-c.dts b/target/linux/brcm63xx/dts/hg556a-c.dts
index 48c601e12809812c05452e2d877b0dabf1c237eb..a8c5e9e271fb3f0f00812a07aaedd7b9c4fbe290 100644 (file)
--- a/target/linux/brcm63xx/dts/hg556a-c.dts
+++ b/target/linux/brcm63xx/dts/hg556a-c.dts
@@ -102,26 +102,33 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x020000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@20000 {
-               label = "linux";
-               reg = <0x020000 0xec0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x020000>;
+                       read-only;
+               };
 
-       cal_data@ee0000 {
-               label = "cal_data";
-               reg = <0xee0000 0x100000>;
-               read-only;
-       };
+               linux@20000 {
+                       label = "linux";
+                       reg = <0x020000 0xec0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               cal_data@ee0000 {
+                       label = "cal_data";
+                       reg = <0xee0000 0x100000>;
+                       read-only;
+               };
 
-       nvram@fe0000 {
-               label = "nvram";
-               reg = <0xfe0000 0x020000>;
+               nvram@fe0000 {
+                       label = "nvram";
+                       reg = <0xfe0000 0x020000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/hg622.dts b/target/linux/brcm63xx/dts/hg622.dts
index 419439d0278614fe48531d87687fa8f5900ea4e0..30a80618e86822f691b54621262f5a83a518a6e4 100644 (file)
--- a/target/linux/brcm63xx/dts/hg622.dts
+++ b/target/linux/brcm63xx/dts/hg622.dts
@@ -56,26 +56,33 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x020000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@20000 {
-               label = "linux";
-               reg = <0x020000 0xf80000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x020000>;
+                       read-only;
+               };
 
-       cal_data@fa0000 {
-               label = "cal_data";
-               reg = <0xfa0000 0x020000>;
-               read-only;
-       };
+               linux@20000 {
+                       label = "linux";
+                       reg = <0x020000 0xf80000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               cal_data@fa0000 {
+                       label = "cal_data";
+                       reg = <0xfa0000 0x020000>;
+                       read-only;
+               };
 
-       nvram@fe0000 {
-               label = "nvram";
-               reg = <0xfe0000 0x020000>;
+               nvram@fe0000 {
+                       label = "nvram";
+                       reg = <0xfe0000 0x020000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/hg655b.dts b/target/linux/brcm63xx/dts/hg655b.dts
index 0336a633e44d86da26fe1f175b9cb642293bdcea..fbdf984423f7fa069edda8e8a30a78572fc219e6 100644 (file)
--- a/target/linux/brcm63xx/dts/hg655b.dts
+++ b/target/linux/brcm63xx/dts/hg655b.dts
@@ -74,30 +74,37 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x020000>;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@20000 {
-               label = "linux";
-               reg = <0x020000 0x770000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x020000>;
+               };
 
-       board_data@790000 {
-               label = "board_data";
-               reg = <0x790000 0x030000>;
-       };
+               linux@20000 {
+                       label = "linux";
+                       reg = <0x020000 0x770000>;
+               };
 
-       cal_data@7c0000 {
-               label = "cal_data";
-               reg = <0x7c0000 0x020000>;
-               read-only;
-       };
+               board_data@790000 {
+                       label = "board_data";
+                       reg = <0x790000 0x030000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
 
-       nvram@7d0000 {
-               label = "nvram";
-               reg = <0x7e0000 0x020000>;
+               cal_data@7c0000 {
+                       label = "cal_data";
+                       reg = <0x7c0000 0x020000>;
+                       read-only;
+               };
+
+               nvram@7d0000 {
+                       label = "nvram";
+                       reg = <0x7e0000 0x020000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/homehub2a.dts b/target/linux/brcm63xx/dts/homehub2a.dts
index 1f55265bccdddfbb84c002d2c9df6c6a9cd34a1c..b3cc23ea0b4245111201548277ef9c8679ce51a3 100644 (file)
--- a/target/linux/brcm63xx/dts/homehub2a.dts
+++ b/target/linux/brcm63xx/dts/homehub2a.dts
@@ -141,19 +141,26 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x020000>;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@20000 {
-               label = "linux";
-               reg = <0x020000 0xfc0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x020000>;
+               };
 
-       nvram@fe0000 {
-               label = "nvram";
-               reg = <0xfe0000 0x020000>;
+               linux@20000 {
+                       label = "linux";
+                       reg = <0x020000 0xfc0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@fe0000 {
+                       label = "nvram";
+                       reg = <0xfe0000 0x020000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/magic.dts b/target/linux/brcm63xx/dts/magic.dts
index c78b836dff3c7230def93737e0cfe662686367ed..65fdb4ed80e0f7e253494903670979ea9f5218a9 100644 (file)
--- a/target/linux/brcm63xx/dts/magic.dts
+++ b/target/linux/brcm63xx/dts/magic.dts
@@ -59,20 +59,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x3e0000>;
-       };
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x3e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
 
-       nvram@3f0000 {
-               label = "nvram";
-               reg = <0x3f0000 0x010000>;
+               nvram@3f0000 {
+                       label = "nvram";
+                       reg = <0x3f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/nb4-fxc-r1.dts b/target/linux/brcm63xx/dts/nb4-fxc-r1.dts
index 9d341ec1a23557ad13416f25fbedee1ecdffe769..eba4b206fe0933ca5029a8b8d0d805ef16590441 100644 (file)
--- a/target/linux/brcm63xx/dts/nb4-fxc-r1.dts
+++ b/target/linux/brcm63xx/dts/nb4-fxc-r1.dts
@@ -103,6 +103,10 @@
        status = "ok";
 
        linux,part-probe = "bcm63xxpart";
+
+       partitions {
+               compatible = "brcm,bcm963xx-cfe-nor-partitions";
+       };
 };
 
 &uart0 {

diff --git a/target/linux/brcm63xx/dts/nb4-ser-r0.dts b/target/linux/brcm63xx/dts/nb4-ser-r0.dts
index e97d9f219df4e4ab74b40471ab29ea32eaf6c640..ac36bd3bb16aaf0941d9a979dac8c920ccccc904 100644 (file)
--- a/target/linux/brcm63xx/dts/nb4-ser-r0.dts
+++ b/target/linux/brcm63xx/dts/nb4-ser-r0.dts
@@ -103,6 +103,10 @@
        status = "ok";
 
        linux,part-probe = "bcm63xxpart";
+
+       partitions {
+               compatible = "brcm,bcm963xx-cfe-nor-partitions";
+       };
 };
 
 &uart0 {

diff --git a/target/linux/brcm63xx/dts/nb6-ser-r0.dts b/target/linux/brcm63xx/dts/nb6-ser-r0.dts
index 70d719e1e3a47e93f4431927934c6d2dae23f931..199aa6d6ef99f7d5e2ac3249f85efe8ff4c2bd28 100644 (file)
--- a/target/linux/brcm63xx/dts/nb6-ser-r0.dts
+++ b/target/linux/brcm63xx/dts/nb6-ser-r0.dts
@@ -66,20 +66,27 @@
 
                linux,part-probe = "bcm63xxpart";
 
-               cfe@0 {
-                       reg = <0x000000 0x010000>;
-                       label = "cfe";
-                       read-only;
-               };
-
-               linux@10000 {
-                       reg = <0x010000 0xfe0000>;
-                       label = "linux";
-               };
-
-               nvram@ff0000 {
-                       reg = <0xff0000 0x010000>;
-                       label = "nvram";
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       cfe@0 {
+                               reg = <0x000000 0x010000>;
+                               label = "cfe";
+                               read-only;
+                       };
+
+                       linux@10000 {
+                               reg = <0x010000 0xfe0000>;
+                               label = "linux";
+                               compatible = "brcm,bcm963xx-imagetag";
+                       };
+
+                       nvram@ff0000 {
+                               reg = <0xff0000 0x010000>;
+                               label = "nvram";
+                       };
                };
        };
 };

diff --git a/target/linux/brcm63xx/dts/p870hw-51a-v2.dts b/target/linux/brcm63xx/dts/p870hw-51a-v2.dts
index d7e5d3e3f6deb89f7f7ccc4959df42e09f128493..62e1acaed8c07f5435ff2023cfee4ac07acb520e 100644 (file)
--- a/target/linux/brcm63xx/dts/p870hw-51a-v2.dts
+++ b/target/linux/brcm63xx/dts/p870hw-51a-v2.dts
@@ -64,20 +64,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x3e0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       nvram@3f0000 {
-               label = "nvram";
-               reg = <0x3f0000 0x010000>;
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x3e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@3f0000 {
+                       label = "nvram";
+                       reg = <0x3f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/r1000h.dts b/target/linux/brcm63xx/dts/r1000h.dts
index 299b520a672a6127dbb0d8b84ed846898511539c..5f773bd29a9f6ee3a10c5b8e34aa1f2c27e32c04 100644 (file)
--- a/target/linux/brcm63xx/dts/r1000h.dts
+++ b/target/linux/brcm63xx/dts/r1000h.dts
@@ -79,17 +79,24 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       CFE@0 {
-               reg = <0x000000 0x020000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@20000 {
-               reg = <0x020000 0x1fc0000>;
-       };
+               CFE@0 {
+                       reg = <0x000000 0x020000>;
+                       read-only;
+               };
 
-       nvram@1fe0000 {
-               reg = <0x1fe0000 0x20000>;
+               linux@20000 {
+                       reg = <0x020000 0x1fc0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@1fe0000 {
+                       reg = <0x1fe0000 0x20000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/r5010unv2.dts b/target/linux/brcm63xx/dts/r5010unv2.dts
index c0b0a85c47006ad1bbd622804427e76238a79331..221b4213e65249282afbabe32ab6536d047952db 100644 (file)
--- a/target/linux/brcm63xx/dts/r5010unv2.dts
+++ b/target/linux/brcm63xx/dts/r5010unv2.dts
@@ -83,20 +83,27 @@
 
                linux,part-probe = "bcm63xxpart";
 
-               cfe@0 {
-                       reg = <0x000000 0x010000>;
-                       label = "cfe";
-                       read-only;
-               };
-
-               linux@10000 {
-                       reg = <0x010000 0x7e0000>;
-                       label = "linux";
-               };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-               nvram@7f0000 {
-                       reg = <0x7f0000 0x010000>;
-                       label = "nvram";
+                       cfe@0 {
+                               reg = <0x000000 0x010000>;
+                               label = "cfe";
+                               read-only;
+                       };
+
+                       linux@10000 {
+                               reg = <0x010000 0x7e0000>;
+                               label = "linux";
+                               compatible = "brcm,bcm963xx-imagetag";
+                       };
+
+                       nvram@7f0000 {
+                               reg = <0x7f0000 0x010000>;
+                               label = "nvram";
+                       };
                };
        };
 };

diff --git a/target/linux/brcm63xx/dts/rg100a.dts b/target/linux/brcm63xx/dts/rg100a.dts
index 871aada25297f92caf829e239f1398fa86bdb188..3a46a3e309a16dfa1778cd6350b061d2899439cb 100644 (file)
--- a/target/linux/brcm63xx/dts/rg100a.dts
+++ b/target/linux/brcm63xx/dts/rg100a.dts
@@ -41,20 +41,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x020000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@20000 {
-               label = "linux";
-               reg = <0x020000 0xfc0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x020000>;
+                       read-only;
+               };
 
-       nvram@fe0000 {
-               label = "nvram";
-               reg = <0xfe0000 0x020000>;
+               linux@20000 {
+                       label = "linux";
+                       reg = <0x020000 0xfc0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@fe0000 {
+                       label = "nvram";
+                       reg = <0xfe0000 0x020000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/rta1025w.dts b/target/linux/brcm63xx/dts/rta1025w.dts
index e4de95dbe435a5edcca69005adc48a2c7e40a00a..d7c2bf886413f24d9c798f2706eb8d7d5ac74893 100644 (file)
--- a/target/linux/brcm63xx/dts/rta1025w.dts
+++ b/target/linux/brcm63xx/dts/rta1025w.dts
@@ -19,20 +19,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
-
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x3e0000>;
-       };
-
-       nvram@3f0000 {
-               label = "nvram";
-               reg = <0x3f0000 0x010000>;
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
+
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x3e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@3f0000 {
+                       label = "nvram";
+                       reg = <0x3f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/rta1320.dts b/target/linux/brcm63xx/dts/rta1320.dts
index aedc9d30f6c7a3eb7c474032f7231344a6158fa6..bec477c33e579af3cdf3dc4004a71349d698acb2 100644 (file)
--- a/target/linux/brcm63xx/dts/rta1320.dts
+++ b/target/linux/brcm63xx/dts/rta1320.dts
@@ -41,20 +41,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x3e0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       nvram@3f0000 {
-               label = "nvram";
-               reg = <0x3f0000 0x010000>;
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x3e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@3f0000 {
+                       label = "nvram";
+                       reg = <0x3f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/rta770bw.dts b/target/linux/brcm63xx/dts/rta770bw.dts
index 0f71467589a85d0abb180013b34be6a04a67bca7..767ff36d0c80d3fbf346e267da6dd237f3b70e11 100644 (file)
--- a/target/linux/brcm63xx/dts/rta770bw.dts
+++ b/target/linux/brcm63xx/dts/rta770bw.dts
@@ -57,20 +57,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x3e0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       nvram@3f0000 {
-               label = "nvram";
-               reg = <0x3f0000 0x010000>;
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x3e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@3f0000 {
+                       label = "nvram";
+                       reg = <0x3f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/rta770w.dts b/target/linux/brcm63xx/dts/rta770w.dts
index ce9f0be377460aede4462784235bc58df2b6d44d..93cf9ffe5947c8dad8becc9e5bcb396b2d3e5e15 100644 (file)
--- a/target/linux/brcm63xx/dts/rta770w.dts
+++ b/target/linux/brcm63xx/dts/rta770w.dts
@@ -57,20 +57,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x3e0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       nvram@3f0000 {
-               label = "nvram";
-               reg = <0x3f0000 0x010000>;
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x3e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@3f0000 {
+                       label = "nvram";
+                       reg = <0x3f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/spw303v.dts b/target/linux/brcm63xx/dts/spw303v.dts
index 7a0002023f0a89e5889aec170a360fd6bea57564..e7113df6dc2140de22b582eb4edcc9fdf4ae2d68 100644 (file)
--- a/target/linux/brcm63xx/dts/spw303v.dts
+++ b/target/linux/brcm63xx/dts/spw303v.dts
@@ -68,20 +68,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x7e0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       nvram@7f0000 {
-               label = "nvram";
-               reg = <0x7f0000 0x010000>;
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x7e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@7f0000 {
+                       label = "nvram";
+                       reg = <0x7f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/spw500v.dts b/target/linux/brcm63xx/dts/spw500v.dts
index c7a4c7dfd294162829d90bca0d80a5dbacfa45f7..af9c6966d3d8770ae47705aa52116fe85b688974 100644 (file)
--- a/target/linux/brcm63xx/dts/spw500v.dts
+++ b/target/linux/brcm63xx/dts/spw500v.dts
@@ -59,20 +59,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x3e0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       nvram@3f0000 {
-               label = "nvram";
-               reg = <0x3f0000 0x010000>;
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x3e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@3f0000 {
+                       label = "nvram";
+                       reg = <0x3f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/td-w8900gb.dts b/target/linux/brcm63xx/dts/td-w8900gb.dts
index e5c02e63aec73c1faf96becdd6b6ae32c8d9f943..e90cd706f7c47cca889e5b9c2e2cbf1f885468b0 100644 (file)
--- a/target/linux/brcm63xx/dts/td-w8900gb.dts
+++ b/target/linux/brcm63xx/dts/td-w8900gb.dts
@@ -59,20 +59,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x020000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@20000 {
-               label = "linux";
-               reg = <0x020000 0x3d0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x020000>;
+                       read-only;
+               };
 
-       nvram@3e0000 {
-               label = "nvram";
-               reg = <0x3f0000 0x010000>;
+               linux@20000 {
+                       label = "linux";
+                       reg = <0x020000 0x3d0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@3e0000 {
+                       label = "nvram";
+                       reg = <0x3f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/usr9108.dts b/target/linux/brcm63xx/dts/usr9108.dts
index 4852d65ad34e20b3862378045238b7fa09adbf88..d2cb81e0dd6eeacf5703f863431e787a326b617d 100644 (file)
--- a/target/linux/brcm63xx/dts/usr9108.dts
+++ b/target/linux/brcm63xx/dts/usr9108.dts
@@ -32,20 +32,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x3e0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       nvram@3f0000 {
-               label = "nvram";
-               reg = <0x3f0000 0x010000>;
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x3e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@3f0000 {
+                       label = "nvram";
+                       reg = <0x3f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/v2110.dts b/target/linux/brcm63xx/dts/v2110.dts
index 93a5d9443686ff4b0559a22df0b15f4a2fbdcc05..b5a7f9ecbf3264121712c4e0769e68ad47ebc209 100644 (file)
--- a/target/linux/brcm63xx/dts/v2110.dts
+++ b/target/linux/brcm63xx/dts/v2110.dts
@@ -58,20 +58,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x3e0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       nvram@3f0000 {
-               label = "nvram";
-               reg = <0x3f0000 0x010000>;
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x3e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@3f0000 {
+                       label = "nvram";
+                       reg = <0x3f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/v2500v-bb.dts b/target/linux/brcm63xx/dts/v2500v-bb.dts
index d6b5964f8c59edc6204461409265f92a8a3ad436..9111e07e03afd0349b9d31dc8a2b527f6267926e 100644 (file)
--- a/target/linux/brcm63xx/dts/v2500v-bb.dts
+++ b/target/linux/brcm63xx/dts/v2500v-bb.dts
@@ -58,20 +58,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x3e0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       nvram@3f0000 {
-               label = "nvram";
-               reg = <0x3f0000 0x010000>;
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x3e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@3f0000 {
+                       label = "nvram";
+                       reg = <0x3f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/vg50.dts b/target/linux/brcm63xx/dts/vg50.dts
index f1d48ea3c194f182cd7287112ea93f62f9049132..9f559f208f11a98795b5418ece1581ff946f8ac9 100644 (file)
--- a/target/linux/brcm63xx/dts/vg50.dts
+++ b/target/linux/brcm63xx/dts/vg50.dts
@@ -48,6 +48,10 @@
                #size-cells = <1>;
 
                linux,part-probe = "bcm63xxpart";
+
+               partitions {
+                       compatible = "brcm,bcm963xx-cfe-nor-partitions";
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/vh4032n.dts b/target/linux/brcm63xx/dts/vh4032n.dts
index 78a708ac06bbb16e40967cc99394d904e4c7b6ea..6c5a3d4b791ac34449341f6da04b58dda2117dee 100644 (file)
--- a/target/linux/brcm63xx/dts/vh4032n.dts
+++ b/target/linux/brcm63xx/dts/vh4032n.dts
@@ -85,20 +85,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x0000000 0x0020000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@20000 {
-               label = "linux";
-               reg = <0x0020000 0x1fc0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x0000000 0x0020000>;
+                       read-only;
+               };
 
-       nvram@1fe0000 {
-               label = "nvram";
-               reg = <0x1fe0000 0x020000>;
+               linux@20000 {
+                       label = "linux";
+                       reg = <0x0020000 0x1fc0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@1fe0000 {
+                       label = "nvram";
+                       reg = <0x1fe0000 0x020000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/vr-3025u.dts b/target/linux/brcm63xx/dts/vr-3025u.dts
index fd2a56769340a6a8429be5440775583bfe0ee264..40f64b057d53028432262999b2f0a596e22b3791 100644 (file)
--- a/target/linux/brcm63xx/dts/vr-3025u.dts
+++ b/target/linux/brcm63xx/dts/vr-3025u.dts
@@ -59,20 +59,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x0000000 0x0020000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@20000 {
-               label = "linux";
-               reg = <0x0020000 0x1fc0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x0000000 0x0020000>;
+                       read-only;
+               };
 
-       nvram@1fe0000 {
-               label = "nvram";
-               reg = <0x1fe0000 0x020000>;
+               linux@20000 {
+                       label = "linux";
+                       reg = <0x0020000 0x1fc0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@1fe0000 {
+                       label = "nvram";
+                       reg = <0x1fe0000 0x020000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/vr-3025un.dts b/target/linux/brcm63xx/dts/vr-3025un.dts
index 61e1972519a3343cb6f9e33f18af46e73e60c6cd..9a3af44c71cf32d36b24b8cd8cee353eb673b717 100644 (file)
--- a/target/linux/brcm63xx/dts/vr-3025un.dts
+++ b/target/linux/brcm63xx/dts/vr-3025un.dts
@@ -59,20 +59,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x7e0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       nvram@7f0000 {
-               label = "nvram";
-               reg = <0x7f0000 0x010000>;
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x7e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@7f0000 {
+                       label = "nvram";
+                       reg = <0x7f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/vr-3026e.dts b/target/linux/brcm63xx/dts/vr-3026e.dts
index 01cb98817a00b71e1ce31f2f36edfee34ed1ba9a..7acf52e34b2323977f2ac8cbebbcec41d7aa4d2f 100644 (file)
--- a/target/linux/brcm63xx/dts/vr-3026e.dts
+++ b/target/linux/brcm63xx/dts/vr-3026e.dts
@@ -59,20 +59,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x7e0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       nvram@7f0000 {
-               label = "nvram";
-               reg = <0x7f0000 0x010000>;
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x7e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@7f0000 {
+                       label = "nvram";
+                       reg = <0x7f0000 0x010000>;
+               };
        };
 };
 

diff --git a/target/linux/brcm63xx/dts/wap-5813n.dts b/target/linux/brcm63xx/dts/wap-5813n.dts
index 1a71426cafeba44dc186b6b13de94e57248733a0..fa9030d4a2ad21c8332b5f5899dee4b63b7416ac 100644 (file)
--- a/target/linux/brcm63xx/dts/wap-5813n.dts
+++ b/target/linux/brcm63xx/dts/wap-5813n.dts
@@ -69,20 +69,27 @@
 
        linux,part-probe = "bcm63xxpart";
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x010000>;
-               read-only;
-       };
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       linux@10000 {
-               label = "linux";
-               reg = <0x010000 0x7e0000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x010000>;
+                       read-only;
+               };
 
-       nvram@7f0000 {
-               label = "nvram";
-               reg = <0x7f0000 0x010000>;
+               linux@10000 {
+                       label = "linux";
+                       reg = <0x010000 0x7e0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
+
+               nvram@7f0000 {
+                       label = "nvram";
+                       reg = <0x7f0000 0x010000>;
+               };
        };
 };