ramips: fix RBM33G partitioning

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / RBM33G.dts

diff --git a/target/linux/ramips/dts/RBM33G.dts b/target/linux/ramips/dts/RBM33G.dts
index 65560ab821e9ee618dfda3ad40603f261aa91ac0..7c0d90010578cb771affbf1e10046ad94819adf8 100644 (file)
--- a/target/linux/ramips/dts/RBM33G.dts
+++ b/target/linux/ramips/dts/RBM33G.dts
@@ -106,15 +106,41 @@
                        #size-cells = <1>;
 
                        partition@0 {
-                               label = "routerboot";
-                               reg = <0x0 0xf000>;
-                               read-only;
-                       };
-
-                       factory: partition@f000 {
-                               label = "factory";
-                               reg = <0xf000 0x71000>;
+                               label = "RouterBoot";
+                               reg = <0x0 0x40000>;
                                read-only;
+                               compatible = "fixed-partitions";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               partition@0 {
+                                       label = "bootloader1";
+                                       reg = <0x0 0xf000>;
+                                       read-only;
+                               };
+
+                               hard_config: partition@f000 {
+                                       label = "hard_config";
+                                       reg = <0xf000 0x1000>;
+                                       read-only;
+                               };
+
+                               partition@10000 {
+                                       label = "bootloader2";
+                                       reg = <0x10000 0xf000>;
+                                       read-only;
+                               };
+
+                               partition@20000 {
+                                       label = "soft_config";
+                                       reg = <0x20000 0x1000>;
+                               };
+
+                               partition@30000 {
+                                       label = "bios";
+                                       reg = <0x30000 0x1000>;
+                                       read-only;
+                               };
                        };
                };
        };
@@ -122,6 +148,7 @@
        w25q128@1 {
                compatible = "jedec,spi-nor";
                reg = <1>;
+               // XXX empiric value to obtain actual 10MHz SCK at the chip
                spi-max-frequency = <3125000>;
 
                partitions {
@@ -129,6 +156,8 @@
                        #address-cells = <1>;
                        #size-cells = <1>;
 
+                       // Region <0x0 0x40000> seems reserved by OEM
+
                        partition@40000 {
                                label = "firmware";
                                reg = <0x040000 0xFC0000>;
@@ -138,7 +167,7 @@
 };
 
 &ethernet {
-       mtd-mac-address = <&factory 0x0010>;
+       mtd-mac-address = <&hard_config 0x0010>;
        mtd-mac-address-increment = <1>;
 };