[openwrt/openwrt] uboot-envtools: support environment in spi-nand on bpi-r64

[LEDE Commits]

dangole pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/dcdafbfc1abe7166f89a24896ea0d92ed1a41f55

commit dcdafbfc1abe7166f89a24896ea0d92ed1a41f55
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Sun Apr 11 16:55:05 2021 +0100

    uboot-envtools: support environment in spi-nand on bpi-r64
    
    Default to U-Boot env in UBI if root device is not mmc block device.
    
    Signed-off-by: Daniel Golle <daniel at makrotopia.org>
    Signed-off-by: Oskari Lemmela <oskari at lemmela.net>
---
 package/boot/uboot-envtools/files/mediatek | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/package/boot/uboot-envtools/files/mediatek b/package/boot/uboot-envtools/files/mediatek
index 11d48adaa7..5e71dc71c9 100644
--- a/package/boot/uboot-envtools/files/mediatek
+++ b/package/boot/uboot-envtools/files/mediatek
@@ -20,9 +20,17 @@ bananapi,bpi-r64)
 	. /lib/upgrade/common.sh
 	export_bootdevice
 	export_partdevice rootdev 0
-	local envdev=/dev/$(get_partition_by_name $rootdev ubootenv)
-	ubootenv_add_uci_config "$envdev" "0x0" "0x80000" "0x80000" "1"
-	ubootenv_add_uci_config "$envdev" "0x80000" "0x80000" "0x80000" "1"
+	case "$rootdev" in
+	mmc*)
+		local envdev=/dev/$(get_partition_by_name $rootdev ubootenv)
+		ubootenv_add_uci_config "$envdev" "0x0" "0x80000" "0x80000" "1"
+		ubootenv_add_uci_config "$envdev" "0x80000" "0x80000" "0x80000" "1"
+		;;
+	*)
+		ubootenv_add_uci_config "/dev/ubi0_0" "0x0" "0x1f000" "0x1f000" "1"
+		ubootenv_add_uci_config "/dev/ubi0_1" "0x0" "0x1f000" "0x1f000" "1"
+		;;
+	esac
 	;;
 buffalo,wsr-2533dhp2)
 	ubootenv_add_uci_config "/dev/mtd3" "0x0" "0x1000" "0x20000"