From dcdafbfc1abe7166f89a24896ea0d92ed1a41f55 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 11 Apr 2021 16:55:05 +0100 Subject: [PATCH] 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 Signed-off-by: Oskari Lemmela --- 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 11d48adaa70..5e71dc71c9e 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" -- 2.30.2