From 688239d91e5706909221509f6168fcb2f04272ce Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
Date: Thu, 8 Aug 2024 16:43:25 +0100
Subject: [PATCH] mediatek: filogic: convert Zyxel EX5601-T0 to fitblk

Use fitblk driver instead of deprecated partition parser.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
 .../dts/mt7986a-zyxel-ex5601-t0-ubootmod.dts    | 17 +++++++++++++++--
 .../filogic/base-files/lib/upgrade/platform.sh  |  8 ++------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-ubootmod.dts b/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-ubootmod.dts
index 62ce50ed23..d562243970 100644
--- a/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-ubootmod.dts
+++ b/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-ubootmod.dts
@@ -13,10 +13,16 @@
 / {
 	model = "Zyxel EX5601-T0 ubootmod";
 	compatible = "zyxel,ex5601-t0-ubootmod", "mediatek,mt7986a";
+
 	memory@40000000 {
 		device_type = "memory";
 		reg = <0x40000000 0x20000000>;
 	};
+
+	chosen {
+		bootargs-append = " root=/dev/fit0 rootwait";
+		rootdisk = <&ubi_rootdisk>;
+	};
 };
 
 &nand_partitions {
@@ -72,16 +78,23 @@
 		reg = <0x380000 0x0200000>;
 		read-only;
 	};
-			
+
 	partition@540000 {
 		label = "zloader";
 		reg = <0x540000 0x0040000>;
 		read-only;
 	};
-			
+
 	partition@580000 {
 		label = "ubi";
 		reg = <0x580000 0x1da80000>;
+		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 0fdbf6e939..bf4919653f 100755
--- a/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
@@ -85,7 +85,8 @@ platform_do_upgrade() {
 	tplink,tl-xtr8488|\
 	xiaomi,mi-router-ax3000t-ubootmod|\
 	xiaomi,redmi-router-ax6000-ubootmod|\
-	xiaomi,mi-router-wr30u-ubootmod)
+	xiaomi,mi-router-wr30u-ubootmod|\
+	zyxel,ex5601-t0-ubootmod)
 		fit_do_upgrade "$1"
 		;;
 	acer,predator-w6|\
@@ -136,11 +137,6 @@ platform_do_upgrade() {
 		CI_ROOT_UBIPART=ubi
 		nand_do_upgrade "$1"
 		;;
-        zyxel,ex5601-t0-ubootmod)
-		CI_KERNPART="fit"
-		CI_ROOTPART="ubi_rootfs"
-                nand_do_upgrade "$1"
-                ;;
 	unielec,u7981-01*)
 		local rootdev="$(cmdline_get_var root)"
 		rootdev="${rootdev##*/}"