mediatek: filogic: move nand-only devices out of bootdev detection
authorTianling Shen <cnsztl@immortalwrt.org>
Sun, 14 Apr 2024 02:42:21 +0000 (10:42 +0800)
committerDaniel Golle <daniel@makrotopia.org>
Thu, 6 Jun 2024 17:56:32 +0000 (18:56 +0100)
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@immortalwrt.org>
target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh

index 4315f69f38c8632dec41b6c3dc4847bfe5d489a5..7e105b10897da92c7092b65382645540c61fbca0 100755 (executable)
@@ -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"