[openwrt/openwrt] mediatek: filogic: move nand-only devices out of bootdev detection

LEDE Commits lede-commits at lists.infradead.org
Thu Jun 6 10:58:00 PDT 2024


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

commit a568540fd4dda9042b8465662860641822c20551
Author: Tianling Shen <cnsztl at immortalwrt.org>
AuthorDate: Sun Apr 14 10:42:21 2024 +0800

    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 <cnsztl at immortalwrt.org>
---
 .../mediatek/filogic/base-files/lib/upgrade/platform.sh    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 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 4315f69f38..7e105b1089 100755
--- a/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
@@ -86,13 +86,9 @@ platform_do_upgrade() {
 	bananapi,bpi-r3-mini|\
 	bananapi,bpi-r4|\
 	bananapi,bpi-r4-poe|\
-	mediatek,mt7988a-rfb|\
 	jdcloud,re-cp-03|\
-	openwrt,one|\
-	tplink,tl-xdr4288|\
-	tplink,tl-xdr6086|\
-	tplink,tl-xdr6088|\
-	xiaomi,redmi-router-ax6000-ubootmod)
+	mediatek,mt7988a-rfb|\
+	openwrt,one)
 		[ -e /dev/fit0 ] && fitblk /dev/fit0
 		[ -e /dev/fitrw ] && fitblk /dev/fitrw
 		bootdev="$(fitblk_get_bootdev)"
@@ -150,7 +146,11 @@ platform_do_upgrade() {
 		CI_UBIPART="ubi0"
 		nand_do_upgrade "$1"
 		;;
-	nokia,ea0326gmp)
+	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"




More information about the lede-commits mailing list