diff options
| author | Paweł Owoc | 2025-05-16 14:22:54 +0000 |
|---|---|---|
| committer | Hauke Mehrtens | 2025-06-26 21:12:20 +0000 |
| commit | 165ca3f3755c8219588bc54c74d387d55422fbd4 (patch) | |
| tree | 3c1567e8734c4cc4ff5893a118c07a3452a80e13 | |
| parent | 8aae84757d645096d7348acbf599da34d792f991 (diff) | |
| download | openwrt-165ca3f3755c8219588bc54c74d387d55422fbd4.tar.gz | |
uboot-tools: move ubootenv_add_ubi_default to common functions
The same function is used twice, so let's make it common.
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>
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 7ca793a8d4..007fc2ffb6 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 ce796a6d00..1ba1019fab 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 71ec8e8e71..7fb995fa82 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" +} |