mediatek: filogic: convert Qihoo 360T7 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-qihoo-360t7.dts b/target/linux/mediatek/dts/mt7981b-qihoo-360t7.dts
index 3925f80ba35ace054207bdb7857faa1cf8cefbae..f167600f30f2ff04dc5f96e2ae3c9daa6fefd7e9 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-qihoo-360t7.dts
+++ b/target/linux/mediatek/dts/mt7981b-qihoo-360t7.dts
@@ -20,6 +20,8 @@
        };
 
        chosen {
+               bootargs-append = " root=/dev/fit0 rootwait";
+               rootdisk = <&ubi_rootdisk>;
                stdout-path = "serial0:115200n8";
        };
 
@@ -134,6 +136,13 @@
                        partition@580000 {
                                label = "ubi";
                                reg = <0x0580000 0x6c00000>;
+                               compatible = "linux,ubi";
+
+                               volumes {
+                                       ubi_rootdisk: ubi-volume-fit {
+                                               volname = "fit";
+                                       };
+                               };
                        };
 
                        partition@7180000 {

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 b7d6f37484a2251dab99b71e45be9a46a9e0391c..ed605ca73c7923b04965ce3f10336d0bd5812c35 100755 (executable)
--- a/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
@@ -77,6 +77,7 @@ platform_do_upgrade() {
        mediatek,mt7988a-rfb|\
        nokia,ea0326gmp|\
        openwrt,one|\
+       qihoo,360t7|\
        tplink,tl-xdr4288|\
        tplink,tl-xdr6086|\
        tplink,tl-xdr6088|\
@@ -116,7 +117,6 @@ platform_do_upgrade() {
                emmc_do_upgrade "$1"
                ;;
        netcore,n60|\
-       qihoo,360t7|\
        xiaomi,mi-router-ax3000t-ubootmod|\
        xiaomi,mi-router-wr30u-ubootmod)
                CI_KERNPART="fit"