[openwrt/openwrt] uboot-envtools: mvebu: update uci defaults for Turris Omnia

[LEDE Commits]

aparcar pushed a commit to openwrt/openwrt.git, branch openwrt-21.02:
https://git.openwrt.org/7bd583e5f31e5c42df47f0286b0dcbc6df30765e

commit 7bd583e5f31e5c42df47f0286b0dcbc6df30765e
Author: Marek Behún <marek.behun at nic.cz>
AuthorDate: Thu Jul 15 20:48:33 2021 +0200

    uboot-envtools: mvebu: update uci defaults for Turris Omnia
    
    From version 2021.09 U-Boot will fixup Turris Omnia's DTB before
    booting, separating U-Boot's environment into separate MTD partition
    "u-boot-env" [1].
    
    Check if "u-boot-env" MTD partition exists and set the uci defaults
    accordingly.
    
    [1] https://lists.denx.de/pipermail/u-boot/2021-July/455017.html
    
    Signed-off-by: Marek Behún <marek.behun at nic.cz>
    (cherry picked from commit 713be7543909b79fbbccdea297e306cb3d3adb0c)
---
 package/boot/uboot-envtools/files/mvebu | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package/boot/uboot-envtools/files/mvebu b/package/boot/uboot-envtools/files/mvebu
index 92b144330f..c4587f8de4 100644
--- a/package/boot/uboot-envtools/files/mvebu
+++ b/package/boot/uboot-envtools/files/mvebu
@@ -18,7 +18,10 @@ buffalo,ls421de)
 	ubootenv_add_uci_config "/dev/mtd3" "0x0" "0x10000"
 	;;
 cznic,turris-omnia)
-	if grep -q 'U-Boot 2015.10-rc2' /dev/mtd0; then
+	idx="$(find_mtd_index u-boot-env)"
+	if [ -n "$idx" ]; then
+		ubootenv_add_uci_config "/dev/mtd${idx}" "0x0" "0x10000" "0x10000"
+	elif grep -q 'U-Boot 2015.10-rc2' /dev/mtd0; then
 		ubootenv_add_uci_config "/dev/mtd0" "0xc0000" "0x10000" "0x40000"
 	else
 		ubootenv_add_uci_config "/dev/mtd0" "0xf0000" "0x10000" "0x10000"