From: Daniel Golle <daniel@makrotopia.org>
Date: Tue, 18 Oct 2022 18:47:25 +0000 (+0100)
Subject: mediatek: filogic: don't rely on image preset in flash or sysupgrade
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=de94587e709e6d8ddaca4fe534e776d2e87437df;p=openwrt%2Fstaging%2Frmilecki.git

mediatek: filogic: don't rely on image preset in flash or sysupgrade

Instead of trying to figure out the actual root device, just use the
kernel 'root' cmdline parameter as a hint to decide which device to
flash to.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---

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 811e5133f2e..a9327ae282a 100755
--- a/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
@@ -2,23 +2,20 @@ REQUIRE_IMAGE_METADATA=1
 
 platform_do_upgrade() {
 	local board=$(board_name)
-	local file_type=$(identify $1)
 
 	case "$board" in
 	bananapi,bpi-r3)
-		export_bootdevice
-		export_partdevice rootdev 0
-		case "$rootdev" in
-		mmc*)
+		case "$(cmdline_get_var root)" in
+		/dev/mmc*)
 			CI_ROOTDEV="$rootdev"
 			CI_KERNPART="production"
 			emmc_do_upgrade "$1"
 			;;
-		mtdblock*)
+		/dev/mtdblock*)
 			PART_NAME="fit"
 			default_do_upgrade "$1"
 			;;
-		ubiblock*)
+		/dev/ubiblock*)
 			CI_KERNPART="fit"
 			nand_do_upgrade "$1"
 			;;
@@ -58,10 +55,8 @@ platform_check_image() {
 platform_copy_config() {
 	case "$(board_name)" in
 	bananapi,bpi-r3)
-		export_bootdevice
-		export_partdevice rootdev 0
-		case "$rootdev" in
-		mmc*)
+		case "$(cmdline_get_var root)" in
+		/dev/mmc*)
 			emmc_copy_config
 			;;
 		esac