From 8d355b870a9d88a052a49005ba2c811bc6810197 Mon Sep 17 00:00:00 2001 From: Furong Xu Date: Thu, 7 Mar 2024 10:56:18 +0800 Subject: [PATCH] mediatek: filogic: switch to fitblk for Xiaomi Redmi AX6000 Use the new fitblk driver. Run-tested: filogic/mt7986a-xiaomi-redmi-router-ax6000-ubootmod Signed-off-by: Furong Xu --- .../mt7986a-xiaomi-redmi-router-ax6000-ubootmod.dts | 13 ++++++++++++- .../dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi | 2 +- .../filogic/base-files/lib/upgrade/platform.sh | 6 +++--- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000-ubootmod.dts b/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000-ubootmod.dts index 152bbd20f8c..a296c768f09 100644 --- a/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000-ubootmod.dts +++ b/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000-ubootmod.dts @@ -8,9 +8,20 @@ compatible = "xiaomi,redmi-router-ax6000-ubootmod", "mediatek,mt7986a"; }; +&chosen { + rootdisk = <&ubi_rootdisk>; +}; + &partitions { partition@580000 { - label = "ubi"; + compatible = "linux,ubi"; reg = <0x580000 0x7a80000>; + label = "ubi"; + + volumes { + ubi_rootdisk: ubi-volume-fit { + volname = "fit"; + }; + }; }; }; diff --git a/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi b/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi index 4d58fbd2cf7..723c4f32968 100644 --- a/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi +++ b/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi @@ -17,7 +17,7 @@ led-upgrade = &led_status_rgb; }; - chosen { + chosen: chosen { stdout-path = "serial0:115200n8"; }; 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 526de081610..abb692fb41d 100755 --- a/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh +++ b/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh @@ -82,7 +82,8 @@ platform_do_upgrade() { ;; bananapi,bpi-r3|\ bananapi,bpi-r3-mini|\ - bananapi,bpi-r4) + bananapi,bpi-r4|\ + xiaomi,redmi-router-ax6000-ubootmod) [ -e /dev/fit0 ] && fitblk /dev/fit0 [ -e /dev/fitrw ] && fitblk /dev/fitrw bootdev="$(fitblk_get_bootdev)" @@ -132,8 +133,7 @@ platform_do_upgrade() { tplink,tl-xdr6086|\ tplink,tl-xdr6088|\ xiaomi,mi-router-ax3000t-ubootmod|\ - xiaomi,mi-router-wr30u-ubootmod|\ - xiaomi,redmi-router-ax6000-ubootmod) + xiaomi,mi-router-wr30u-ubootmod) CI_KERNPART="fit" nand_do_upgrade "$1" ;;