From d657ca6760752ce54de04934d34623de80159fc9 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Thu, 8 Aug 2024 16:42:15 +0100 Subject: [PATCH] mediatek: filogic: convert Xiaomi WR30U to fitblk Use fitblk driver instead of deprecated partition parser. Signed-off-by: Daniel Golle --- .../dts/mt7981b-xiaomi-mi-router-wr30u-ubootmod.dts | 12 ++++++++++++ .../filogic/base-files/lib/upgrade/platform.sh | 6 +++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-wr30u-ubootmod.dts b/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-wr30u-ubootmod.dts index 6d0f3feb45..b22bbed379 100644 --- a/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-wr30u-ubootmod.dts +++ b/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-wr30u-ubootmod.dts @@ -6,11 +6,23 @@ / { model = "Xiaomi Mi Router WR30U (OpenWrt U-Boot layout)"; compatible = "xiaomi,mi-router-wr30u-ubootmod", "mediatek,mt7981"; + + chosen { + bootargs-append = " root=/dev/fit0 rootwait"; + rootdisk = <&ubi_rootdisk>; + }; }; &partitions { partition@600000 { label = "ubi"; reg = <0x600000 0x7000000>; + 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 a160811b20..034f94b515 100755 --- a/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh +++ b/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh @@ -83,7 +83,8 @@ platform_do_upgrade() { tplink,tl-xdr6088|\ tplink,tl-xtr8488|\ xiaomi,mi-router-ax3000t-ubootmod|\ - xiaomi,redmi-router-ax6000-ubootmod) + xiaomi,redmi-router-ax6000-ubootmod|\ + xiaomi,mi-router-wr30u-ubootmod) fit_do_upgrade "$1" ;; acer,predator-w6|\ @@ -117,8 +118,7 @@ platform_do_upgrade() { CI_ROOTPART="rootfs" emmc_do_upgrade "$1" ;; - netcore,n60|\ - xiaomi,mi-router-wr30u-ubootmod) + netcore,n60) CI_KERNPART="fit" nand_do_upgrade "$1" ;; -- 2.30.2