From ab3c9ccb615032d18b2395ca2d68523fc1565dc3 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Mon, 16 Jan 2023 21:02:00 +0000 Subject: [PATCH] mediatek: filogic: fix sysupgrade on MMC on the BPi-R3 A previous attempt to simplify things went wrong and now sysupgrade is broken on this device. Fix that. Fixes: de94587e70 ("mediatek: filogic: don't rely on image preset in flash or sysupgrade") Signed-off-by: Daniel Golle --- .../filogic/base-files/lib/upgrade/platform.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 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 c2808bc736..93b202218a 100755 --- a/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh +++ b/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh @@ -43,17 +43,20 @@ platform_do_upgrade() { case "$board" in bananapi,bpi-r3) - case "$(cmdline_get_var root)" in - /dev/mmc*) + local rootdev="$(cmdline_get_var root)" + rootdev="${rootdev##*/}" + rootdev="${rootdev%p[0-9]*}" + case "$rootdev" in + mmc*) CI_ROOTDEV="$rootdev" CI_KERNPART="production" emmc_do_upgrade "$1" ;; - /dev/mtdblock*) + mtdblock*) PART_NAME="fit" default_do_upgrade "$1" ;; - /dev/ubiblock*) + ubiblock*) CI_KERNPART="fit" nand_do_upgrade "$1" ;; -- 2.30.2