uboot-envtools: mt7622: bpi-r64: fix env selection

[openwrt/staging/noltari.git] / package / boot / uboot-envtools / files / mediatek_mt7622

diff --git a/package/boot/uboot-envtools/files/mediatek_mt7622 b/package/boot/uboot-envtools/files/mediatek_mt7622
index 830414225e6e262304d17fb5724c0e88d4be56cb..e01dcc4fefdd0f4993ed45cb802a399d6119ebe4 100644 (file)
--- a/package/boot/uboot-envtools/files/mediatek_mt7622
+++ b/package/boot/uboot-envtools/files/mediatek_mt7622
@@ -17,16 +17,16 @@ linksys,e8450-ubi)
        ubootenv_add_uci_config "/dev/ubi0_1" "0x0" "0x1f000" "0x1f000" "1"
        ;;
 bananapi,bpi-r64)
-       . /lib/upgrade/common.sh
-       export_bootdevice
-       export_partdevice rootdev 0
+       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" "0x80000" "0x80000" "1"
                ubootenv_add_uci_config "$envdev" "0x80000" "0x80000" "0x80000" "1"
                ;;
-       *)
+       ubi*)
                ubootenv_add_uci_config "/dev/ubi0_0" "0x0" "0x1f000" "0x1f000" "1"
                ubootenv_add_uci_config "/dev/ubi0_1" "0x0" "0x1f000" "0x1f000" "1"
                ;;
@@ -39,7 +39,7 @@ ruijie,rg-ew3200gx-pro)
        ubootenv_add_uci_config "/dev/mtd3" "0x0" "0x20000" "0x20000"
        ;;
 ubnt,unifi-6-lr-ubootmod)
-       ubootenv_add_uci_config "/dev/mtd2" "0x0" "0x4000" "0x10000"
+       ubootenv_add_uci_config "/dev/mtd2" "0x0" "0x4000" "0x1000"
        ;;
 xiaomi,redmi-router-ax6s)
        ubootenv_add_uci_config "/dev/mtd3" "0x0" "0x10000" "0x40000"