[openwrt/openwrt] mediatek: filogic: convert H3C Magic NX30 Pro to fitblk

LEDE Commits lede-commits at lists.infradead.org
Wed Aug 28 07:12:20 PDT 2024


dangole pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/52ef01672cf0766ca550531f76b13b7d8af73dcd

commit 52ef01672cf0766ca550531f76b13b7d8af73dcd
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Thu Aug 8 16:22:17 2024 +0100

    mediatek: filogic: convert H3C Magic NX30 Pro to fitblk
    
    Use fitblk driver instead of deprecated partition parser.
    
    Signed-off-by: Daniel Golle <daniel at makrotopia.org>
---
 target/linux/mediatek/dts/mt7981b-h3c-magic-nx30-pro.dts         | 9 +++++++++
 target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/target/linux/mediatek/dts/mt7981b-h3c-magic-nx30-pro.dts b/target/linux/mediatek/dts/mt7981b-h3c-magic-nx30-pro.dts
index 030cc25041..c405ce977e 100644
--- a/target/linux/mediatek/dts/mt7981b-h3c-magic-nx30-pro.dts
+++ b/target/linux/mediatek/dts/mt7981b-h3c-magic-nx30-pro.dts
@@ -20,6 +20,8 @@
 	};
 
 	chosen {
+		bootargs-append = " root=/dev/fit0 rootwait";
+		rootdisk = <&ubi_rootdisk>;
 		stdout-path = "serial0:115200n8";
 	};
 
@@ -141,6 +143,13 @@
 			partition at 580000 {
 				label = "ubi";
 				reg = <0x0580000 0x4000000>;
+				compatible = "linux,ubi";
+
+				volumes {
+					ubi_rootdisk: ubi-volume-fit {
+						volname = "fit";
+					};
+				};
 			};
 
 			/* yaffs partition */
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 dedb3a4a1f..8f5518659a 100755
--- a/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
@@ -70,6 +70,7 @@ platform_do_upgrade() {
 	bananapi,bpi-r4|\
 	bananapi,bpi-r4-poe|\
 	cmcc,rax3000m|\
+	h3c,magic-nx30-pro|\
 	jdcloud,re-cp-03|\
 	mediatek,mt7981-rfb|\
 	mediatek,mt7988a-rfb|\
@@ -113,7 +114,6 @@ platform_do_upgrade() {
 		CI_ROOTPART="rootfs"
 		emmc_do_upgrade "$1"
 		;;
-	h3c,magic-nx30-pro|\
 	jcg,q30-pro|\
 	netcore,n60|\
 	qihoo,360t7|\




More information about the lede-commits mailing list