[openwrt/openwrt] uboot-envtools: ipq60xx: code simplification
LEDE Commits
lede-commits at lists.infradead.org
Sun Feb 9 11:34:44 PST 2025
robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/1bb1b03f696a6e25c1639889f740eb1c5d1c7f5f
commit 1bb1b03f696a6e25c1639889f740eb1c5d1c7f5f
Author: Robert Marko <robimarko at gmail.com>
AuthorDate: Fri Feb 7 21:54:25 2025 +0100
uboot-envtools: ipq60xx: code simplification
Do the same code simplification as was done for ipq807x to avoid code
duplication.
Link: https://github.com/openwrt/openwrt/pull/17907
Signed-off-by: Robert Marko <robimarko at gmail.com>
---
.../boot/uboot-envtools/files/qualcommax_ipq60xx | 28 +++++++++-------------
1 file changed, 11 insertions(+), 17 deletions(-)
diff --git a/package/boot/uboot-envtools/files/qualcommax_ipq60xx b/package/boot/uboot-envtools/files/qualcommax_ipq60xx
index 1c1bfd1230..2dc60bebe1 100644
--- a/package/boot/uboot-envtools/files/qualcommax_ipq60xx
+++ b/package/boot/uboot-envtools/files/qualcommax_ipq60xx
@@ -7,33 +7,27 @@ touch /etc/config/ubootenv
board=$(board_name)
+ubootenv_add_mtd() {
+ local idx="$(find_mtd_index "${1}")"
+ [ -n "$idx" ] && \
+ ubootenv_add_uci_config "/dev/mtd$idx" "${2}" "${3}" "${4}"
+}
+
case "$board" in
8devices,mango-dvk|\
8devices,mango-dvk-sfp|\
cambiumnetworks,xe3-4)
- idx="$(find_mtd_index 0:APPSBLENV)"
- [ -n "$idx" ] && \
- ubootenv_add_uci_config "/dev/mtd$idx" "0x0" "0x10000" "0x10000"
+ ubootenv_add_mtd "0:APPSBLENV" "0x0" "0x10000" "0x10000"
;;
linksys,mr7350)
- idx="$(find_mtd_index u_env)"
- [ -n "$idx" ] && \
- ubootenv_add_uci_config "/dev/mtd$idx" "0x0" "0x40000" "0x20000"
- ;;
-netgear,wax214)
- idx="$(find_mtd_index 0:appsblenv)"
- [ -n "$idx" ] && \
- ubootenv_add_uci_config "/dev/mtd$idx" "0x0" "0x40000" "0x20000"
+ ubootenv_add_mtd "u_env" "0x0" "0x40000" "0x20000"
;;
+netgear,wax214|\
tplink,eap610-outdoor)
- idx="$(find_mtd_index 0:appsblenv)"
- [ -n "$idx" ] && \
- ubootenv_add_uci_config "/dev/mtd$idx" "0x0" "0x40000" "0x20000"
+ ubootenv_add_mtd "0:appsblenv" "0x0" "0x40000" "0x20000"
;;
yuncore,fap650)
- idx="$(find_mtd_index 0:appsblenv)"
- [ -n "$idx" ] && \
- ubootenv_add_uci_config "/dev/mtd$idx" "0x0" "0x10000" "0x10000"
+ ubootenv_add_mtd "0:appsblenv" "0x0" "0x10000" "0x10000"
;;
esac
More information about the lede-commits
mailing list