From 1559b9feef6378d3f0216af11b4056354eb288a7 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sun, 14 Apr 2024 10:42:21 +0800 Subject: [PATCH] mediatek: filogic: move nand-only devices out of bootdev detection For the first-time installation (mostly migrates from vendor firmware) the ubiblock is not ready, but bootdev detection relies on it. This means users must create ubiblock manually otherwise the sysupgrade will not work. Now a unique case is added for nand devices which use new fit format, let's move to it. Signed-off-by: Tianling Shen --- .../filogic/base-files/lib/upgrade/platform.sh | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) 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 7de95367c1..795e23c86b 100755 --- a/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh +++ b/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh @@ -82,12 +82,7 @@ platform_do_upgrade() { ;; bananapi,bpi-r3|\ bananapi,bpi-r3-mini|\ - bananapi,bpi-r4|\ - nokia,ea0326gmp|\ - tplink,tl-xdr4288|\ - tplink,tl-xdr6086|\ - tplink,tl-xdr6088|\ - xiaomi,redmi-router-ax6000-ubootmod) + bananapi,bpi-r4) [ -e /dev/fit0 ] && fitblk /dev/fit0 [ -e /dev/fitrw ] && fitblk /dev/fitrw bootdev="$(fitblk_get_bootdev)" @@ -149,6 +144,16 @@ platform_do_upgrade() { CI_UBIPART="ubi0" nand_do_upgrade "$1" ;; + nokia,ea0326gmp|\ + tplink,tl-xdr4288|\ + tplink,tl-xdr6086|\ + tplink,tl-xdr6088|\ + xiaomi,redmi-router-ax6000-ubootmod) + [ -e /dev/fit0 ] && fitblk /dev/fit0 + [ -e /dev/fitrw ] && fitblk /dev/fitrw + CI_KERNPART="fit" + nand_do_upgrade "$1" + ;; ubnt,unifi-6-plus) CI_KERNPART="kernel0" EMMC_ROOT_DEV="$(cmdline_get_var root)"