From bdc8f0fa6f1ce1baf42f141d41a23d5b9b8ee015 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Wed, 15 Jul 2020 15:32:46 +0200 Subject: [PATCH] imx-boot: ccimx8x: store mkimage log for signing Store mkimage log for every built target so it can be later used by the signing script to create the correct CSF file for every target. https://jira.digi.com/browse/DEL-7158 Signed-off-by: Gonzalo Ruiz --- .../recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend index b11468bc8..5c794c7a4 100644 --- a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend +++ b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend @@ -89,7 +89,7 @@ do_compile () { for target in ${IMXBOOT_TARGETS}; do for rev in ${SOC_REVISIONS}; do bbnote "building ${SOC_TARGET} - ${ramc} - REV=${rev} ${target}" - make SOC=${SOC_TARGET} dtbs=${UBOOT_DTB_NAME} REV=${rev} ${target} + make SOC=${SOC_TARGET} dtbs=${UBOOT_DTB_NAME} REV=${rev} ${target} > mkimage-${target}.log 2>&1 if [ -e "${BOOT_STAGING}/flash.bin" ]; then cp ${BOOT_STAGING}/flash.bin ${S}/${UBOOT_PREFIX}-${MACHINE}-${rev}-${ramc}.bin-${target} fi @@ -219,10 +219,9 @@ do_deploy_append () { for ramc in ${UBOOT_RAM_COMBINATIONS}; do for rev in ${SOC_REVISIONS}; do for target in ${IMXBOOT_TARGETS}; do - # Do not sign "flash_regression_linux_m4" target files - if [ "${target}" != "flash_regression_linux_m4" ]; then - trustfence-sign-uboot.sh ${DEPLOYDIR}/${UBOOT_PREFIX}-${MACHINE}-${rev}-${ramc}.bin-${target} ${DEPLOYDIR}/${UBOOT_PREFIX}-signed-${MACHINE}-${rev}-${ramc}.bin-${target} - fi + # Link to current "target" mkimage log + ln -sf mkimage-${target}.log mkimage.log + trustfence-sign-uboot.sh ${DEPLOYDIR}/${UBOOT_PREFIX}-${MACHINE}-${rev}-${ramc}.bin-${target} ${DEPLOYDIR}/${UBOOT_PREFIX}-signed-${MACHINE}-${rev}-${ramc}.bin-${target} done done done