Browse Source

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 <[email protected]>
Daniel Golle 2 years ago
parent
commit
ab3c9ccb61
1 changed files with 7 additions and 4 deletions
  1. 7 4
      target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh

+ 7 - 4
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"
 			;;