Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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>
This commit is contained in:
Daniel Golle 2023-01-29 03:42:15 +00:00
parent e51a57e192
commit 90dbdb4941
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
package/boot/uboot-envtools/files/mediatek_filogic
View file

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