Parcourir la source

uboot-envtools: filogic: bpi-r3: fix env selection

Selecting the environment when booting from SD card has been broken by
a previous commit. Fix it.

Fixes: f46355b4d7 ("uboot-envtools: mediatek_filogic: fix BPi-R3 when no OS is installed")
Signed-off-by: Daniel Golle <[email protected]>
Daniel Golle il y a 2 ans
Parent
commit
90dbdb4941
1 fichiers modifiés avec 7 ajouts et 4 suppressions
  1. 7 4
      package/boot/uboot-envtools/files/mediatek_filogic

+ 7 - 4
package/boot/uboot-envtools/files/mediatek_filogic

@@ -13,18 +13,21 @@ board=$(board_name)
 
 case "$board" in
 bananapi,bpi-r3)
-	case "$(cmdline_get_var root)" in
-	/dev/mmc*)
+	rootdev="$(cmdline_get_var root)"
+	rootdev="${rootdev##*/}"
+	rootdev="${rootdev%%p[0-9]*}"
+	case "$rootdev" in
+	mmc*)
 		local envdev=$(find_mmc_part "ubootenv" $rootdev)
 		ubootenv_add_uci_config "$envdev" "0x0" "0x40000" "0x40000" "1"
 		ubootenv_add_uci_config "$envdev" "0x40000" "0x40000" "0x40000" "1"
 		;;
-	/dev/mtd*)
+	mtd*)
 		local envdev=/dev/mtd$(find_mtd_index "u-boot-env")
 		ubootenv_add_uci_config "$envdev" "0x0" "0x20000" "0x20000" "1"
 		ubootenv_add_uci_config "$envdev" "0x20000" "0x20000" "0x20000" "1"
 		;;
-	/dev/ubi*)
+	ubi*)
 		. /lib/upgrade/nand.sh
 		local envubi=$(nand_find_ubi ubi)
 		local envdev=/dev/$(nand_find_volume $envubi ubootenv)