ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-04-09 20:31:59 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

uboot-envtools: use /lib/upgrade/fit.sh

Browse Source 
Use export_fitblk_bootdev() in /lib/upgrade/fit.sh instead of now
deprecated fitblk_get_bootdev() function. Include /lib/upgrade/fit.sh
instead of /lib/upgrade/common.sh to allow removing the function there.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2024-07-17 16:25:05 +01:00
parent 4448d6325f
commit 386855dca8
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
package/boot/uboot-envtools/files/mediatek_filogic
View File

@ -41,17 +41,17 @@ bananapi,bpi-r3-mini|\
bananapi,bpi-r4|\
bananapi,bpi-r4-poe|\
jdcloud,re-cp-03)
. /lib/upgrade/common.sh
bootdev="$(fitblk_get_bootdev)"
case "$bootdev" in
ubi*)
. /lib/upgrade/fit.sh
export_fitblk_bootdev
case "$CI_METHOD" in
ubi)
ubootenv_add_ubi_default
;;
mmc*)
ubootenv_add_mmc_default "${bootdev%%p[0-9]*}"
emmc)
bootdev=${EMMC_KERN_DEV%%p[0-9]*}
ubootenv_add_mmc_default "${bootdev#/dev/}"
;;
mtd*)
default)
ubootenv_add_nor_default
;;
esac

17
package/boot/uboot-envtools/files/mediatek_mt7622
View File

@ -31,17 +31,16 @@ dlink,eagle-pro-ai-m32-a1|\
dlink,eagle-pro-ai-r32-a1)
ubootenv_add_uci_config "/dev/mtd3" "0x0" "0x2000" "0x2000"
;;
bananapi,bpi-r64|\
linksys,e8450-ubi)
ubootenv_add_ubi_default
;;
bananapi,bpi-r64)
. /lib/upgrade/common.sh
bootdev="$(fitblk_get_bootdev)"
case "$bootdev" in
mmc*)
ubootenv_add_mmc_default "${bootdev%p[0-9]*}"
. /lib/upgrade/fit.sh
export_fitblk_bootdev
case "$CI_METHOD" in
emmc)
bootdev=${EMMC_KERN_DEV%%p[0-9]*}
ubootenv_add_mmc_default "${bootdev#/dev/}"
;;
ubi*)
ubi)
ubootenv_add_ubi_default
;;
esac