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

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>

diff --git a/package/boot/uboot-envtools/files/mediatek_filogic b/package/boot/uboot-envtools/files/mediatek_filogic
index 0e30c489c97233edbf7a25e0e6434c43d65ff75e..4d1016d412e26c8c709c4e8d0e56e27fb93b1cc9 100644 (file)
--- a/package/boot/uboot-envtools/files/mediatek_filogic
+++ b/package/boot/uboot-envtools/files/mediatek_filogic
@@ -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

diff --git a/package/boot/uboot-envtools/files/mediatek_mt7622 b/package/boot/uboot-envtools/files/mediatek_mt7622
index 6698e06ee352c021e3b7f3d302070e7842bfdc86..ae173fad61af6427904bf6b49119dc00295679ce 100644 (file)
--- a/package/boot/uboot-envtools/files/mediatek_mt7622
+++ b/package/boot/uboot-envtools/files/mediatek_mt7622
@@ -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