|
@@ -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)
|