uboot-envtools: support environment in spi-nand on bpi-r64
authorDaniel Golle <daniel@makrotopia.org>
Sun, 11 Apr 2021 15:55:05 +0000 (16:55 +0100)
committerDaniel Golle <daniel@makrotopia.org>
Sun, 11 Apr 2021 19:19:49 +0000 (20:19 +0100)
Default to U-Boot env in UBI if root device is not mmc block device.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Signed-off-by: Oskari Lemmela <oskari@lemmela.net>
package/boot/uboot-envtools/files/mediatek

index 11d48adaa7068cb9fefb69160b1a32ece684832d..5e71dc71c9e29764a3694762301e0dca40b20194 100644 (file)
@@ -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"