@@ -90,29 +90,56 @@
#size-cells = <1>;
compatible = "jedec,spi-nor";
reg = <0>;
+ // XXX empiric value to obtain actual 10MHz SCK at the chip
spi-max-frequency = <3125000>;
- partition@0 {
- label = "routerboot";
- reg = <0x000000 0x00F000>;
- read-only;
- };
-
- factory: partition@f000 {
- label = "factory";
- reg = <0x00F000 0x031000>;
- read-only;
- };
-
- partition@40000 {
- label = "firmware";
- reg = <0x040000 0xFC0000>;
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ partition@0 {
+ label = "RouterBoot";
+ reg = <0x0 0x40000>;
+ read-only;
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ routerboot@0 {
+ reg = <0x0 0xf000>;
+ read-only;
+ };
+
+ hard_config: hard_config@f000 {
+ reg = <0xf000 0x1000>;
+ read-only;
+ };
+
+ routerboot2@10000 {
+ reg = <0x10000 0xf000>;
+ read-only;
+ };
+
+ soft_config@20000 {
+ reg = <0x20000 0x1000>;
+ };
+
+ bios@30000 {
+ reg = <0x30000 0x1000>;
+ read-only;
+ };
+ };
+
+ firmware@40000 {
+ reg = <0x040000 0xFC0000>;
+ };
};
};
};
ðernet {
- mtd-mac-address = <&factory 0x0010>;
+ mtd-mac-address = <&hard_config 0x0010>;
mtd-mac-address-increment = <1>;
};