ramips: move partition definitions out of mt7621.dtsi file

Partitions defined in parent dtsi cannot be undefined in children.
This moves partitions defined in mt7621.dtsi into board's device tree.

Signed-off-by: Nikolay Martynov <mar.kolya@gmail.com>
SVN-Revision: 47876

diff --git a/target/linux/ramips/dts/MT7621.dts b/target/linux/ramips/dts/MT7621.dts
index fefdb98b86a07bb1da4646f4f9fd729af0147489..341d8f2a70d36477db0c8d62badabc7d7c63ad40 100644 (file)
--- a/target/linux/ramips/dts/MT7621.dts
+++ b/target/linux/ramips/dts/MT7621.dts
@@ -31,4 +31,26 @@
                        };
                };
        };
+
+       nand@1e003000 {
+               partition@0 {
+                       label = "uboot";
+                       reg = <0x00000 0x80000>; /* 64 KB */
+               };
+
+               partition@80000 {
+                       label = "uboot_env";
+                       reg = <0x80000 0x80000>; /* 64 KB */
+               };
+
+               partition@100000 {
+                       label = "factory";
+                       reg = <0x100000 0x40000>;
+               };
+
+               partition@140000 {
+                       label = "rootfs";
+                       reg = <0x140000 0xec0000>;
+               };
+       };
 };

diff --git a/target/linux/ramips/dts/mt7621.dtsi b/target/linux/ramips/dts/mt7621.dtsi
index 9c6f45b1e0e7f5c05d3d927185a4f7f7735a9034..facc0a382de8c6299f009fe01ee80fbb9a3b9e3f 100644 (file)
--- a/target/linux/ramips/dts/mt7621.dtsi
+++ b/target/linux/ramips/dts/mt7621.dtsi
@@ -278,26 +278,6 @@
                        0x1e003800 0x800>;
                #address-cells = <1>;
                #size-cells = <1>;
-
-               partition@0 {
-                       label = "uboot";
-                       reg = <0x00000 0x80000>; /* 64 KB */
-               };
-
-               partition@80000 {
-                       label = "uboot_env";
-                       reg = <0x80000 0x80000>; /* 64 KB */
-               };
-
-               partition@100000 {
-                       label = "factory";
-                       reg = <0x100000 0x40000>;
-               };
-
-               partition@140000 {
-                       label = "rootfs";
-                       reg = <0x140000 0xec0000>;
-               };
        };
 
        ethernet@1e100000 {