From 165ca3f3755c8219588bc54c74d387d55422fbd4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pawe=C5=82=20Owoc?= Date: Fri, 16 May 2025 16:22:54 +0200 Subject: [PATCH] uboot-tools: move ubootenv_add_ubi_default to common functions MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The same function is used twice, so let's make it common. Signed-off-by: Paweł Owoc Link: https://github.com/openwrt/openwrt/pull/18818 Signed-off-by: Hauke Mehrtens --- .../uboot-tools/uboot-envtools/files/mediatek_filogic | 9 --------- .../uboot-tools/uboot-envtools/files/mediatek_mt7622 | 9 --------- .../uboot-tools/uboot-envtools/files/uboot-envtools.sh | 9 +++++++++ 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/package/boot/uboot-tools/uboot-envtools/files/mediatek_filogic b/package/boot/uboot-tools/uboot-envtools/files/mediatek_filogic index 7ca793a8d49..007fc2ffb68 100644 --- a/package/boot/uboot-tools/uboot-envtools/files/mediatek_filogic +++ b/package/boot/uboot-tools/uboot-envtools/files/mediatek_filogic @@ -21,15 +21,6 @@ ubootenv_add_nor_default() { ubootenv_add_mtd "u-boot-env" "0x20000" "0x20000" "0x20000" "1" } -ubootenv_add_ubi_default() { - . /lib/upgrade/nand.sh - local envubi=$(nand_find_ubi ubi) - local envdev=/dev/$(nand_find_volume $envubi ubootenv) - local envdev2=/dev/$(nand_find_volume $envubi ubootenv2) - ubootenv_add_uci_config "$envdev" "0x0" "0x1f000" "0x1f000" "1" - ubootenv_add_uci_config "$envdev2" "0x0" "0x1f000" "0x1f000" "1" -} - case "$board" in abt,asr3000|\ asus,zenwifi-bt8-ubootmod|\ diff --git a/package/boot/uboot-tools/uboot-envtools/files/mediatek_mt7622 b/package/boot/uboot-tools/uboot-envtools/files/mediatek_mt7622 index ce796a6d00b..1ba1019fab0 100644 --- a/package/boot/uboot-tools/uboot-envtools/files/mediatek_mt7622 +++ b/package/boot/uboot-tools/uboot-envtools/files/mediatek_mt7622 @@ -14,15 +14,6 @@ ubootenv_add_mmc_default() { ubootenv_add_mmc "ubootenv" "${1:-mmcblk0}" "0x80000" "0x80000" "0x80000" "1" } -ubootenv_add_ubi_default() { - . /lib/upgrade/nand.sh - local envubi=$(nand_find_ubi ubi) - local envdev=/dev/$(nand_find_volume $envubi ubootenv) - local envdev2=/dev/$(nand_find_volume $envubi ubootenv2) - ubootenv_add_uci_config "$envdev" "0x0" "0x1f000" "0x1f000" "1" - ubootenv_add_uci_config "$envdev2" "0x0" "0x1f000" "0x1f000" "1" -} - board=$(board_name) case "$board" in 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 71ec8e8e715..7fb995fa823 100644 --- a/package/boot/uboot-tools/uboot-envtools/files/uboot-envtools.sh +++ b/package/boot/uboot-tools/uboot-envtools/files/uboot-envtools.sh @@ -62,3 +62,12 @@ ubootenv_add_mmc() { [ -n "$mmcpart" ] && \ ubootenv_add_uci_config "$mmcpart" "${3}" "${4}" "${5}" "${6}" } + +ubootenv_add_ubi_default() { + . /lib/upgrade/nand.sh + local envubi=$(nand_find_ubi ubi) + local envdev=/dev/$(nand_find_volume $envubi ubootenv) + local envdev2=/dev/$(nand_find_volume $envubi ubootenv2) + ubootenv_add_uci_config "$envdev" "0x0" "0x1f000" "0x1f000" "1" + ubootenv_add_uci_config "$envdev2" "0x0" "0x1f000" "0x1f000" "1" +} -- 2.47.2