From: Daniel Golle Date: Sun, 25 Feb 2024 21:08:57 +0000 (+0000) Subject: uboot-envtools: replace use of platform_get_bootdev X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fstintel.git;a=commitdiff_plain;h=fc865eb3ae0369a966490ec5e8a3991d4553eb40 uboot-envtools: replace use of platform_get_bootdev Use new function fitblk_get_bootdev in /lib/upgrade/common.sh instead. Signed-off-by: Daniel Golle --- diff --git a/package/boot/uboot-envtools/files/mediatek_filogic b/package/boot/uboot-envtools/files/mediatek_filogic index fcab697d90..08d2bf782b 100644 --- a/package/boot/uboot-envtools/files/mediatek_filogic +++ b/package/boot/uboot-envtools/files/mediatek_filogic @@ -39,9 +39,9 @@ asus,rt-ax59u) bananapi,bpi-r3|\ bananapi,bpi-r3-mini|\ bananapi,bpi-r4) - . /lib/upgrade/platform.sh + . /lib/upgrade/common.sh - bootdev="$(platform_get_bootdev)" + bootdev="$(fitblk_get_bootdev)" case "$bootdev" in ubi*) ubootenv_add_ubi_default diff --git a/package/boot/uboot-envtools/files/mediatek_mt7622 b/package/boot/uboot-envtools/files/mediatek_mt7622 index b4b1698d3f..c8d3857484 100644 --- a/package/boot/uboot-envtools/files/mediatek_mt7622 +++ b/package/boot/uboot-envtools/files/mediatek_mt7622 @@ -35,8 +35,8 @@ linksys,e8450-ubi) ubootenv_add_ubi_default ;; bananapi,bpi-r64) - . /lib/upgrade/platform.sh - bootdev="$(platform_get_bootdev)" + . /lib/upgrade/common.sh + bootdev="$(fitblk_get_bootdev)" case "$bootdev" in mmc*) ubootenv_add_mmc_default "${bootdev%p[0-9]*}" diff --git a/package/boot/uboot-envtools/files/mediatek_mt7623 b/package/boot/uboot-envtools/files/mediatek_mt7623 index a676e98bd7..008aff5785 100644 --- a/package/boot/uboot-envtools/files/mediatek_mt7623 +++ b/package/boot/uboot-envtools/files/mediatek_mt7623 @@ -13,8 +13,8 @@ board=$(board_name) case "$board" in bananapi,bpi-r2) - . /lib/upgrade/platform.sh - bootdev="$(platform_get_bootdev)" + . /lib/upgrade/common.sh + bootdev="$(fitblk_get_bootdev)" ubootenv_add_uci_config "/dev/${bootdev%p[0-9]*}p1" "0xb0000" "0x10000" "0x10000" "1" ;; unielec,u7623-02)