mediatek: filogic: convert Xiaomi AX3000T to fitblk

Use fitblk driver instead of deprecated partition parser.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-ax3000t-ubootmod.dts b/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-ax3000t-ubootmod.dts
index 809e625ce1ebc5a7264e5777dd3e34845af19dae..7466b8f7c6dcb504f1846774413cf148d04cf42e 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-ax3000t-ubootmod.dts
+++ b/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-ax3000t-ubootmod.dts
@@ -6,11 +6,23 @@
 / {
        model = "Xiaomi Mi Router AX3000T (OpenWrt U-Boot layout)";
        compatible = "xiaomi,mi-router-ax3000t-ubootmod", "mediatek,mt7981";
+
+       chosen {
+               bootargs-append = " root=/dev/fit0 rootwait";
+               rootdisk = <&ubi_rootdisk>;
+       };
 };
 
 &partitions {
        partition@600000 {
                label = "ubi";
                reg = <0x600000 0x7000000>;
+                               compatible = "linux,ubi";
+
+                               volumes {
+                                       ubi_rootdisk: ubi-volume-fit {
+                                               volname = "fit";
+                                       };
+                               };
        };
 };

diff --git a/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh b/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
index ed605ca73c7923b04965ce3f10336d0bd5812c35..a160811b2042e09ead69341831c01252f8828301 100755 (executable)
--- a/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
@@ -82,6 +82,7 @@ platform_do_upgrade() {
        tplink,tl-xdr6086|\
        tplink,tl-xdr6088|\
        tplink,tl-xtr8488|\
+       xiaomi,mi-router-ax3000t-ubootmod|\
        xiaomi,redmi-router-ax6000-ubootmod)
                fit_do_upgrade "$1"
                ;;
@@ -117,7 +118,6 @@ platform_do_upgrade() {
                emmc_do_upgrade "$1"
                ;;
        netcore,n60|\
-       xiaomi,mi-router-ax3000t-ubootmod|\
        xiaomi,mi-router-wr30u-ubootmod)
                CI_KERNPART="fit"
                nand_do_upgrade "$1"