From 609f29da622a70bd00ee7482bee1da6bc56f0dad Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Thu, 8 Aug 2024 16:22:53 +0100 Subject: [PATCH] mediatek: filogic: convert JCG Q30 PRO to fitblk Use fitblk driver instead of deprecated partition parser. Signed-off-by: Daniel Golle --- target/linux/mediatek/dts/mt7981b-jcg-q30-pro.dts | 9 +++++++++ .../mediatek/filogic/base-files/lib/upgrade/platform.sh | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/target/linux/mediatek/dts/mt7981b-jcg-q30-pro.dts b/target/linux/mediatek/dts/mt7981b-jcg-q30-pro.dts index c8b9aeba42..e866799ebc 100644 --- a/target/linux/mediatek/dts/mt7981b-jcg-q30-pro.dts +++ b/target/linux/mediatek/dts/mt7981b-jcg-q30-pro.dts @@ -21,6 +21,8 @@ }; chosen { + bootargs-append = " root=/dev/fit0 rootwait"; + rootdisk = <&ubi_rootdisk>; stdout-path = "serial0:115200n8"; }; @@ -146,6 +148,13 @@ partition@580000 { label = "ubi"; reg = <0x0580000 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 8f5518659a..b7d6f37484 100755 --- a/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh +++ b/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh @@ -71,6 +71,7 @@ platform_do_upgrade() { bananapi,bpi-r4-poe|\ cmcc,rax3000m|\ h3c,magic-nx30-pro|\ + jcg,q30-pro|\ jdcloud,re-cp-03|\ mediatek,mt7981-rfb|\ mediatek,mt7988a-rfb|\ @@ -114,7 +115,6 @@ platform_do_upgrade() { CI_ROOTPART="rootfs" emmc_do_upgrade "$1" ;; - jcg,q30-pro|\ netcore,n60|\ qihoo,360t7|\ xiaomi,mi-router-ax3000t-ubootmod|\