From: Daniel Golle <daniel@makrotopia.org>
Date: Thu, 8 Aug 2024 15:42:59 +0000 (+0100)
Subject: mediatek: filogic: convert Netcore N60 to fitblk
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=ca4f5b0def2878eff183cb5f3d62565c6e9b2db6;p=openwrt%2Fstaging%2Fpepe2k.git

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 b96b1e2ec0..2c129acbba 100644
--- 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 034f94b515..0fdbf6e939 100755
--- 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"