[openwrt/openwrt] uboot-envtools: mvebu: fix config for mainline u-boot

[LEDE Commits]

hauke pushed a commit to openwrt/openwrt.git, branch openwrt-19.07:
https://git.openwrt.org/3af9c5fefd8dca95da4899c7bb244b508f49813f

commit 3af9c5fefd8dca95da4899c7bb244b508f49813f
Author: Andre Heider <a.heider at gmail.com>
AuthorDate: Sat Sep 12 10:28:21 2020 +0200

    uboot-envtools: mvebu: fix config for mainline u-boot
    
    Mainline u-boot dynamically passes the mtd partitions via devicetree:
    $ cat /proc/mtd
    dev:    size   erasesize  name
    mtd0: 003f0000 00001000 "firmware"
    mtd1: 00010000 00001000 "u-boot-env"
    
    Add support for this setup.
    
    Signed-off-by: Andre Heider <a.heider at gmail.com>
    (cherry picked from commit 60c9a27cbcc6ba00d75b4b592f507237dbfb460f)
---
 package/boot/uboot-envtools/files/mvebu | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/package/boot/uboot-envtools/files/mvebu b/package/boot/uboot-envtools/files/mvebu
index c2e746d959..5af81b0fe1 100644
--- a/package/boot/uboot-envtools/files/mvebu
+++ b/package/boot/uboot-envtools/files/mvebu
@@ -20,7 +20,14 @@ cznic,turris-omnia)
 globalscale,espressobin|\
 globalscale,espressobin-emmc|\
 globalscale,espressobin-v7|\
-globalscale,espressobin-v7-emmc|\
+globalscale,espressobin-v7-emmc)
+	idx="$(find_mtd_index u-boot-env)"
+	if [ -n "$idx" ]; then
+		ubootenv_add_uci_config "/dev/mtd$idx" "0x0" "0x10000" "0x10000" "1"
+	else
+		ubootenv_add_uci_config "/dev/mtd0" "0x3f0000" "0x10000" "0x10000" "1"
+	fi
+	;;
 marvell,armada8040-mcbin)
 	ubootenv_add_uci_config "/dev/mtd0" "0x3f0000" "0x10000" "0x10000" "1"
 	;;