From: Paweł Owoc <frut3k7@gmail.com>
Date: Fri, 16 May 2025 14:06:57 +0000 (+0200)
Subject: uboot-tools: update ubootenv_add_* functions
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40e4dd5d31b482f4f53fafe8fdf74b70a03df066;p=thirdparty%2Fopenwrt.git

uboot-tools: update ubootenv_add_* functions

Add posibility to specify:
- ROOTDEV (mmc)
- number of blocks (mtd)

Signed-off-by: Paweł Owoc <frut3k7@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/18818
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

diff --git a/package/boot/uboot-tools/uboot-envtools/files/qualcommax_ipq807x b/package/boot/uboot-tools/uboot-envtools/files/qualcommax_ipq807x
index ae0946190df..3b4ae59fc64 100644
--- a/package/boot/uboot-tools/uboot-envtools/files/qualcommax_ipq807x
+++ b/package/boot/uboot-tools/uboot-envtools/files/qualcommax_ipq807x
@@ -48,14 +48,14 @@ xiaomi,ax9000)
 	ubootenv_add_sys_mtd "bdata" "0x0" "0x10000" "0x20000"
 	;;
 prpl,haze)
-	ubootenv_add_mmc "0:APPSBLENV" "0x0" "0x40000" "0x400" "0x100"
+	ubootenv_add_mmc "0:APPSBLENV" "" "0x0" "0x40000" "0x400" "0x100"
 	;;
 asus,rt-ax89x|\
 qnap,301w)
 	ubootenv_add_mtd "0:appsblenv" "0x0" "0x20000" "0x20000"
 	;;
 spectrum,sax1v1k)
-	ubootenv_add_mmc "0:APPSBLENV" "0x0" "0x40000" "0x40000" "1"
+	ubootenv_add_mmc "0:APPSBLENV" "" "0x0" "0x40000" "0x40000" "1"
 	;;
 esac
 
diff --git a/package/boot/uboot-tools/uboot-envtools/files/uboot-envtools.sh b/package/boot/uboot-tools/uboot-envtools/files/uboot-envtools.sh
index 23687d9826d..71ec8e8e715 100644
--- a/package/boot/uboot-tools/uboot-envtools/files/uboot-envtools.sh
+++ b/package/boot/uboot-tools/uboot-envtools/files/uboot-envtools.sh
@@ -48,17 +48,17 @@ ubootenv_add_app_config() {
 ubootenv_add_mtd() {
 	local idx="$(find_mtd_index "${1}")"
 	[ -n "$idx" ] && \
-		ubootenv_add_uci_config "/dev/mtd$idx" "${2}" "${3}" "${4}"
+		ubootenv_add_uci_config "/dev/mtd$idx" "${2}" "${3}" "${4}" "${5}"
 }
 
 ubootenv_add_sys_mtd() {
 	local idx="$(find_mtd_index "${1}")"
 	[ -n "$idx" ] && \
-		ubootenv_add_uci_sys_config "/dev/mtd$idx" "${2}" "${3}" "${4}"
+		ubootenv_add_uci_sys_config "/dev/mtd$idx" "${2}" "${3}" "${4}" "${5}"
 }
 
 ubootenv_add_mmc() {
-	local mmcpart="$(find_mmc_part "${1}")"
+	local mmcpart="$(find_mmc_part "${1}" "${2}")"
 	[ -n "$mmcpart" ] && \
-		ubootenv_add_uci_config "$mmcpart" "${2}" "${3}" "${4}" "${5}"
+		ubootenv_add_uci_config "$mmcpart" "${3}" "${4}" "${5}" "${6}"
 }