From 5a311a7e4a1b1cb20dcc54424239fcbeb4bb7f89 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Tue, 9 Jul 2019 10:20:06 +0200 Subject: [PATCH] imx-boot: re-add machine name to boot filenames With the rework to support variants, the machine name (actually the UBOOT_CONFIG) was removed from the filename. Re-add it using ${MACHINE_NAME} which is more appropriate than the ${UBOOT_CONFIG} which contains the RAM size (now present in ${ramc}). While on it, remove one of the two symlinks on DEPLOYDIR. Only one makes sense. Signed-off-by: Hector Palacios https://jira.digi.com/browse/DEL-6641 --- .../recipes-bsp/imx-mkimage/imx-boot_0.2.bbappend | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_0.2.bbappend b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_0.2.bbappend index 35ebae7ef..c10bbc506 100644 --- a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_0.2.bbappend +++ b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_0.2.bbappend @@ -65,7 +65,7 @@ do_compile () { bbnote "building ${SOC_TARGET} - ${ramc} - ${target}" make SOC=${SOC_TARGET} ${target} if [ -e "${BOOT_STAGING}/flash.bin" ]; then - cp ${BOOT_STAGING}/flash.bin ${S}/${BOOT_CONFIG_MACHINE}-${ramc}.bin-${target} + cp ${BOOT_STAGING}/flash.bin ${S}/${BOOT_CONFIG_MACHINE}-${MACHINE}-${ramc}.bin-${target} fi SCFWBUILT="yes" done @@ -88,7 +88,7 @@ do_install () { install -d ${D}/boot for ramc in ${RAM_CONFIGS}; do for target in ${IMXBOOT_TARGETS}; do - install -m 0644 ${S}/${BOOT_CONFIG_MACHINE}-${ramc}.bin-${target} ${D}/boot/ + install -m 0644 ${S}/${BOOT_CONFIG_MACHINE}-${MACHINE}-${ramc}.bin-${target} ${D}/boot/ done done } @@ -114,11 +114,10 @@ do_deploy () { IMAGE_IMXBOOT_TARGET="$target" echo "Set boot target as $IMAGE_IMXBOOT_TARGET" fi - install -m 0644 ${S}/${BOOT_CONFIG_MACHINE}-${ramc}.bin-${target} ${DEPLOYDIR} + install -m 0644 ${S}/${BOOT_CONFIG_MACHINE}-${MACHINE}-${ramc}.bin-${target} ${DEPLOYDIR} done cd ${DEPLOYDIR} - ln -sf ${BOOT_CONFIG_MACHINE}-${ramc}.bin-${IMAGE_IMXBOOT_TARGET} ${BOOT_CONFIG_MACHINE}-${ramc}.bin - ln -sf ${BOOT_CONFIG_MACHINE}-${ramc}.bin-${IMAGE_IMXBOOT_TARGET} ${BOOT_CONFIG_MACHINE}-${MACHINE}-${ramc}.bin + ln -sf ${BOOT_CONFIG_MACHINE}-${MACHINE}-${ramc}.bin-${IMAGE_IMXBOOT_TARGET} ${BOOT_CONFIG_MACHINE}-${MACHINE}-${ramc}.bin cd - done }