mediatek: filogic: convert Netcore N60 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/mt7986a-netcore-n60.dts b/target/linux/mediatek/dts/mt7986a-netcore-n60.dts
index b96b1e2ec03e8a10606c01811bf9fe6ca1d14996..2c129acbbabb051f1092b00987ba9d211a7c40cf 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-netcore-n60.dts
+++ b/target/linux/mediatek/dts/mt7986a-netcore-n60.dts
@@ -21,6 +21,8 @@
        };
 
        chosen {
+               bootargs-append = " root=/dev/fit0 rootwait";
+               rootdisk = <&ubi_rootdisk>;
                stdout-path = "serial0:115200n8";
        };
 
@@ -206,6 +208,13 @@
                        partition@580000 {
                                label = "ubi";
                                reg = <0x0580000 0x7280000>;
+                               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 034f94b51553aab21cdc79f78a22fce01434b8b8..0fdbf6e9398e92efcbd9e70aee9dfdf9649343f2 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|\
+       netcore,n60|\
        qihoo,360t7|\
        tplink,tl-xdr4288|\
        tplink,tl-xdr6086|\
@@ -118,10 +119,6 @@ platform_do_upgrade() {
                CI_ROOTPART="rootfs"
                emmc_do_upgrade "$1"
                ;;
-       netcore,n60)
-               CI_KERNPART="fit"
-               nand_do_upgrade "$1"
-               ;;
        mercusys,mr90x-v1|\
        tplink,re6000xd)
                CI_UBIPART="ubi0"