diff options
| author | Daniel Golle | 2022-10-19 19:01:35 +0000 |
|---|---|---|
| committer | Daniel Golle | 2022-10-19 19:05:21 +0000 |
| commit | 84b5b0f88c2f67b682f1d7e0461c10152f3e5f1b (patch) | |
| tree | a5488d759f995c8315db9065d93e494ecffa8e49 | |
| parent | d640cbac0e76e3638504cb6b239886e8ff75018f (diff) | |
| download | openwrt-84b5b0f88c2f67b682f1d7e0461c10152f3e5f1b.tar.gz | |
uboot-envtools: mediatek/mt7622: don't rely on mapped rootfs
Similar to the implementation for the BPi-R3 use the same logic also
for determining the device to look for the U-Boot environment of the
BPi-R64.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
| -rw-r--r-- | package/boot/uboot-envtools/files/mediatek_mt7622 | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/package/boot/uboot-envtools/files/mediatek_mt7622 b/package/boot/uboot-envtools/files/mediatek_mt7622 index 654f78056a..9ad4c7c1a7 100644 --- a/package/boot/uboot-envtools/files/mediatek_mt7622 +++ b/package/boot/uboot-envtools/files/mediatek_mt7622 @@ -17,16 +17,13 @@ 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 - case "$rootdev" in - mmc*) + case "$(cmdline_get_var root)" in + /dev/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" ;; - *) + /dev/ubi*) ubootenv_add_uci_config "/dev/ubi0_0" "0x0" "0x1f000" "0x1f000" "1" ubootenv_add_uci_config "/dev/ubi0_1" "0x0" "0x1f000" "0x1f000" "1" ;; |