From: Daniel Golle <daniel@makrotopia.org>
Date: Thu, 8 Aug 2024 15:41:21 +0000 (+0100)
Subject: mediatek: filogic: convert Qihoo 360T7 to fitblk
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ee7aacb3e7becae1c6f7b2c8a94dc63d2dad3bb2;p=openwrt%2Fstaging%2Fblocktrron.git

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 3925f80ba3..f167600f30 100644
--- 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 b7d6f37484..ed605ca73c 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|\
+	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"