diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb index a761870b5..4ea4f7532 100644 --- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb +++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb @@ -18,14 +18,12 @@ DEPENDS += " \ # xxd is a dependency of fspi_packer.sh DEPENDS += "xxd-native" DEPENDS:append:mx8m-generic-bsp = " u-boot-mkimage-native dtc-native" -BOOT_NAME = "imx-boot" -PROVIDES = "${BOOT_NAME}" inherit deploy uuu_bootloader_tag -UUU_BOOTLOADER = "${BOOT_NAME}" -UUU_BOOTLOADER_TAGGED = "${BOOT_NAME}-tagged" -UUU_BOOTLOADER_UNTAGGED = "${BOOT_NAME}-untagged" +UUU_BOOTLOADER = "imx-boot" +UUU_BOOTLOADER_TAGGED = "imx-boot-tagged" +UUU_BOOTLOADER_UNTAGGED = "imx-boot-untagged" # Add CFLAGS with native INCDIR & LIBDIR for imx-mkimage build CFLAGS = "-O2 -Wall -std=c99 -I ${STAGING_INCDIR_NATIVE} -L ${STAGING_LIBDIR_NATIVE}" @@ -184,7 +182,7 @@ do_compile() { UBOOT_DTB_NAME_EXTRA="${dtb_name}" fi UBOOT_NAME_EXTRA="u-boot-${MACHINE}.bin-${UBOOT_CONFIG_EXTRA}" - BOOT_CONFIG_MACHINE_EXTRA="${BOOT_NAME}-${MACHINE}-${UBOOT_CONFIG_EXTRA}.bin" + BOOT_CONFIG_MACHINE_EXTRA="imx-boot-${MACHINE}-${UBOOT_CONFIG_EXTRA}.bin" for target in ${IMXBOOT_TARGETS}; do compile_${SOC_FAMILY} @@ -223,7 +221,7 @@ do_install () { bbnote "UBOOT_CONFIG = $type" UBOOT_CONFIG_EXTRA="$type" - BOOT_CONFIG_MACHINE_EXTRA="${BOOT_NAME}-${MACHINE}-${UBOOT_CONFIG_EXTRA}.bin" + BOOT_CONFIG_MACHINE_EXTRA="imx-boot-${MACHINE}-${UBOOT_CONFIG_EXTRA}.bin" for target in ${IMXBOOT_TARGETS}; do install -m 0644 ${S}/${BOOT_CONFIG_MACHINE_EXTRA}-${target} ${D}/boot/ @@ -306,7 +304,7 @@ do_deploy() { for type in ${UBOOT_CONFIG}; do UBOOT_CONFIG_EXTRA="$type" UBOOT_NAME_EXTRA="u-boot-${MACHINE}.bin-${UBOOT_CONFIG_EXTRA}" - BOOT_CONFIG_MACHINE_EXTRA="${BOOT_NAME}-${MACHINE}-${UBOOT_CONFIG_EXTRA}.bin" + BOOT_CONFIG_MACHINE_EXTRA="imx-boot-${MACHINE}-${UBOOT_CONFIG_EXTRA}.bin" if [ -e ${DEPLOY_DIR_IMAGE}/u-boot-spl.bin-${MACHINE}-${UBOOT_CONFIG_EXTRA} ] ; then install -m 0644 ${DEPLOY_DIR_IMAGE}/u-boot-spl.bin-${MACHINE}-${UBOOT_CONFIG_EXTRA} \ @@ -325,9 +323,9 @@ do_deploy() { install -m 0644 ${S}/${BOOT_CONFIG_MACHINE_EXTRA}-${target} ${DEPLOYDIR} done - # The first UBOOT_CONFIG listed will be the ${BOOT_NAME} binary + # The first UBOOT_CONFIG listed will be the imx-boot binary if [ ! -f "${DEPLOYDIR}/${UUU_BOOTLOADER}" ]; then - ln -sf ${BOOT_CONFIG_MACHINE_EXTRA}-${IMAGE_IMXBOOT_TARGET} ${DEPLOYDIR}/${BOOT_NAME} + ln -sf ${BOOT_CONFIG_MACHINE_EXTRA}-${IMAGE_IMXBOOT_TARGET} ${DEPLOYDIR}/imx-boot else bbwarn "Use custom wks.in for $UBOOT_CONFIG = $type" fi