mediatek: filogic: convert H3C Magic NX30 Pro 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-h3c-magic-nx30-pro.dts b/target/linux/mediatek/dts/mt7981b-h3c-magic-nx30-pro.dts
index 030cc25041685313d2485706d110f08b505451e4..c405ce977e7a09bbbbf5c94174c6fc34253b2482 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-h3c-magic-nx30-pro.dts
+++ b/target/linux/mediatek/dts/mt7981b-h3c-magic-nx30-pro.dts
@@ -20,6 +20,8 @@
        };
 
        chosen {
+               bootargs-append = " root=/dev/fit0 rootwait";
+               rootdisk = <&ubi_rootdisk>;
                stdout-path = "serial0:115200n8";
        };
 
@@ -141,6 +143,13 @@
                        partition@580000 {
                                label = "ubi";
                                reg = <0x0580000 0x4000000>;
+                               compatible = "linux,ubi";
+
+                               volumes {
+                                       ubi_rootdisk: ubi-volume-fit {
+                                               volname = "fit";
+                                       };
+                               };
                        };
 
                        /* yaffs partition */

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 dedb3a4a1fa588bcacc9074fa85a9b7c380a46e6..8f5518659ad5245d3ad1e02b58e371474b0738ea 100755 (executable)
--- a/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
@@ -70,6 +70,7 @@ platform_do_upgrade() {
        bananapi,bpi-r4|\
        bananapi,bpi-r4-poe|\
        cmcc,rax3000m|\
+       h3c,magic-nx30-pro|\
        jdcloud,re-cp-03|\
        mediatek,mt7981-rfb|\
        mediatek,mt7988a-rfb|\
@@ -113,7 +114,6 @@ platform_do_upgrade() {
                CI_ROOTPART="rootfs"
                emmc_do_upgrade "$1"
                ;;
-       h3c,magic-nx30-pro|\
        jcg,q30-pro|\
        netcore,n60|\
        qihoo,360t7|\