@@ -53,7 +53,7 @@
ð1 {
status = "okay";
- mtd-mac-address = <&art 0x10>;
+ mtd-mac-address = <&hard_config 0x10>;
pll-data = <0x03000101 0x80000101 0x80001313>;
phy-handle = <&phy0>;
@@ -81,32 +81,41 @@
#size-cells = <1>;
partition@0 {
- label = "routerboot";
- reg = <0x000000 0x00e000>;
+ label = "RouterBoot";
+ reg = <0x0 0x20000>;
read-only;
- };
-
- art: partition@e000 {
- label = "art";
- reg = <0x000e000 0x001000>;
- read-only;
- };
-
- partition@f000 {
- label = "bios";
- reg = <0x000f000 0x001000>;
- read-only;
- };
-
- partition@10000 {
- label = "routerboot2";
- reg = <0x010000 0x00f000>;
- read-only;
- };
-
- partition@1f000 {
- label = "soft_config";
- reg = <0x001f000 0x001000>;
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ partition@0 {
+ label = "bootloader1";
+ reg = <0x0 0xe000>;
+ read-only;
+ };
+
+ hard_config: partition@e000 {
+ label = "hard_config";
+ reg = <0xe000 0x1000>;
+ read-only;
+ };
+
+ partition@f000 {
+ label = "bios";
+ reg = <0xf000 0x1000>;
+ read-only;
+ };
+
+ partition@10000 {
+ label = "bootloader2";
+ reg = <0x10000 0xf000>;
+ read-only;
+ };
+
+ partition@1f000 {
+ label = "soft_config";
+ reg = <0x1f000 0x1000>;
+ };
};
partition@20000 {
@@ -43,8 +43,8 @@ case "$FIRMWARE" in
ath9k_patch_mac $(mtd_get_mac_ascii u-boot-env ethaddr)
;;
mikrotik,routerboard-wap-g-5hact2hnd)
- mikrotik_caldata_extract "art" 0x1000 0x440
- ath9k_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x10) +2)
+ mikrotik_caldata_extract "hard_config" 0x1000 0x440
+ ath9k_patch_mac $(macaddr_add $(mtd_get_mac_binary hard_config 0x10) +2)
;;
nec,wg800hp)
caldata_extract "art" 0x1000 0x440
@@ -67,7 +67,7 @@ case "$FIRMWARE" in
ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x0) +2)
;;
mikrotik,routerboard-wap-g-5hact2hnd)
- mikrotik_caldata_extract "art" 0x5000 0x844
+ mikrotik_caldata_extract "hard_config" 0x5000 0x844
;;
nec,wg800hp)
caldata_extract "art" 0x5000 0x844