From 2db7047ba40efed4d9e7c86c63d71158d974e297 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 19 Aug 2024 10:28:08 -0700 Subject: imx-boot: Fix 8M multi-config build problems Building in the NXP layer meta-imx with the latest imx-boot recipe, the dtb is not found during mkimage build: ``` | NOTE: building iMX8MP - TEE=tee.bin-stmm flash_evk_stmm_capsule | dtc -@ -I dts -O dtb -o signature.dtbo signature.dts | fdtoverlay -i imx8mp-evk.dtb -o imx8mp-evk.dtb signature.dtbo | Couldn't open blob from 'imx8mp-evk.dtb': No such file or directory ``` The problem is the recipe does now copy the dtb from u-boot-imx with a config-adorned name, e.g., imx8mp-evk.dtb-sd, but mkimage is still expecting imx8mp-evk.dtb. Add a link for compatibility. Signed-off-by: Tom Hochstein --- recipes-bsp/imx-mkimage/imx-boot_1.0.bb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb index 3f5b2c65d..7013d6d1f 100644 --- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb +++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb @@ -101,17 +101,19 @@ compile_mx8m() { if [ "x${UBOOT_SIGN_ENABLE}" = "x1" ] ; then # Use DTB binary patched with signature node - cp ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_BINARY} ${BOOT_STAGING}/${UBOOT_DTB_NAME_EXTRA} + cp ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_BINARY} ${BOOT_STAGING}/${UBOOT_DTB_NAME_EXTRA} else - cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${UBOOT_DTB_NAME_EXTRA} ${BOOT_STAGING} + cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${UBOOT_DTB_NAME_EXTRA} \ + ${BOOT_STAGING} fi + ln -sf ${UBOOT_DTB_NAME_EXTRA} ${BOOT_STAGING}/${UBOOT_DTB_NAME} cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG_EXTRA} \ ${BOOT_STAGING}/u-boot-nodtb.bin cp ${DEPLOY_DIR_IMAGE}/${ATF_MACHINE_NAME} ${BOOT_STAGING}/bl31.bin - cp ${DEPLOY_DIR_IMAGE}/${UBOOT_NAME_EXTRA} ${BOOT_STAGING}/u-boot.bin + cp ${DEPLOY_DIR_IMAGE}/${UBOOT_NAME_EXTRA} ${BOOT_STAGING}/u-boot.bin } -- cgit v1.2.3-54-g00ecf