[openwrt/openwrt] uboot-envtools: ath79: update ubootenv partion index for gl-ar300m

[LEDE Commits]

ynezz pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/7d97fe55f422d37ec6907b9c1609b42688315dd7

commit 7d97fe55f422d37ec6907b9c1609b42688315dd7
Author: Huangbin Zhan <zhanhb88 at gmail.com>
AuthorDate: Thu Jul 9 05:01:54 2020 +0800

    uboot-envtools: ath79: update ubootenv partion index for gl-ar300m
    
    The block index of u-boot-env changed from mtd1 to mtd3 after upgrading kernel to 5.4.
    This patch search the mtd block by label name, work as expect when perform a clean flash.
    
    Signed-off-by: Huangbin Zhan <zhanhb88 at gmail.com>
---
 package/boot/uboot-envtools/files/ath79 | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/package/boot/uboot-envtools/files/ath79 b/package/boot/uboot-envtools/files/ath79
index 5f5a448861..5cd64f4ffd 100644
--- a/package/boot/uboot-envtools/files/ath79
+++ b/package/boot/uboot-envtools/files/ath79
@@ -19,10 +19,6 @@ buffalo,bhr-4grv2|\
 devolo,magic-2-wifi|\
 engenius,ecb1750|\
 etactica,eg200|\
-glinet,gl-ar300m-lite|\
-glinet,gl-ar300m-nand|\
-glinet,gl-ar300m-nor|\
-glinet,gl-ar300m16|\
 glinet,gl-ar750s-nor|\
 glinet,gl-ar750s-nor-nand|\
 librerouter,librerouter-v1|\
@@ -52,6 +48,14 @@ domywifi,dw33d)
 glinet,gl-ar150)
 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x8000" "0x10000"
 	;;
+glinet,gl-ar300m-lite|\
+glinet,gl-ar300m-nand|\
+glinet,gl-ar300m-nor|\
+glinet,gl-ar300m16)
+	idx="$(find_mtd_index u-boot-env)"
+	[ -n "$idx" ] && \
+		ubootenv_add_uci_config "/dev/mtd$idx" "0x0" "0x10000" "0x10000"
+	;;
 netgear,wndr3700|\
 netgear,wndr3700-v2|\
 netgear,wndrmac-v1)