ath79/mikrotik: use routerbootpart partitions

Enable routerbootpart partitions on MikroTik devices.

Tested-by: Roger Pueyo Centelles <roger.pueyo@guifi.net>
Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>

diff --git a/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts b/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts
index 74cf1315b659b6bcde9389fe139b962cb646f25a..a0190760fb893d8fccc852aad0b19d18fa4ede60 100644 (file)
--- a/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts
+++ b/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts
@@ -84,37 +84,33 @@
                                label = "RouterBoot";
                                reg = <0x0 0x20000>;
                                read-only;
-                               compatible = "fixed-partitions";
+                               compatible = "mikrotik,routerboot-partitions";
                                #address-cells = <1>;
                                #size-cells = <1>;
 
                                partition@0 {
                                        label = "bootloader1";
-                                       reg = <0x0 0xe000>;
+                                       reg = <0x0 0x0>;
                                        read-only;
                                };
 
-                               hard_config: partition@e000 {
-                                       label = "hard_config";
-                                       reg = <0xe000 0x1000>;
+                               hard_config: hard_config {
                                        read-only;
                                };
 
-                               partition@f000 {
-                                       label = "bios";
-                                       reg = <0xf000 0x1000>;
+                               bios {
+                                       size = <0x1000>;
                                        read-only;
                                };
 
                                partition@10000 {
                                        label = "bootloader2";
-                                       reg = <0x10000 0xf000>;
+                                       reg = <0x10000 0x0>;
                                        read-only;
                                };
 
-                               partition@1f000 {
+                               soft_config {
                                        label = "soft_config";
-                                       reg = <0x1f000 0x1000>;
                                };
                        };
 

diff --git a/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts b/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts
index dd4d523368ac56043950ece72edf387028cd4312..7377953f787b93fe6c054000506e982e2393bb5b 100644 (file)
--- a/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts
+++ b/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts
@@ -99,32 +99,25 @@
                spi-max-frequency = <25000000>;
 
                partitions {
-                       compatible = "fixed-partitions";
+                       compatible = "mikrotik,routerboot-partitions";
                        #address-cells = <1>;
                        #size-cells = <1>;
 
                        partition@0 {
                                label = "routerboot";
-                               reg = <0x0000000 0x000c000>;
+                               reg = <0x0 0x0>;
                                read-only;
                        };
 
-                       hard_config: partition@c000 {
-                               label = "hard_config";
-                               reg = <0x000c000 0x0001000>;
+                       hard_config: hard_config {
                                read-only;
                        };
 
-                       partition@d000 {
-                               label = "bios";
-                               reg = <0x000d000 0x0001000>;
+                       bios {
                                read-only;
                        };
 
-                       partition@e000 {
-                               label = "soft_config";
-                               reg = <0x000e000 0x0001000>;
-                               read-only;
+                       soft_config {
                        };
                };
        };