aboutsummaryrefslogtreecommitdiffstats
path: root/package/boot
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2023-01-29 03:42:15 +0000
committerDaniel Golle <daniel@makrotopia.org>2023-01-29 03:43:58 +0000
commit90dbdb4941ba79055cc9327c6f7d503583020c96 (patch)
treeb56d2658fcd3ea830c64286c07173db3d2b56f1e /package/boot
parente51a57e1924176afe60cd6e76b7ee4eec3e6f6a2 (diff)
downloadupstream-90dbdb4941ba79055cc9327c6f7d503583020c96.tar.gz
upstream-90dbdb4941ba79055cc9327c6f7d503583020c96.tar.bz2
upstream-90dbdb4941ba79055cc9327c6f7d503583020c96.zip
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 <daniel@makrotopia.org>
Diffstat (limited to 'package/boot')
-rw-r--r--package/boot/uboot-envtools/files/mediatek_filogic11
1 files changed, 7 insertions, 4 deletions
diff --git a/package/boot/uboot-envtools/files/mediatek_filogic b/package/boot/uboot-envtools/files/mediatek_filogic
index 787fac8dd6..30cd0e8367 100644
--- a/package/boot/uboot-envtools/files/mediatek_filogic
+++ b/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)