summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2024-08-19 10:28:08 -0700
committerHiago De Franco <hiago.franco@toradex.com>2024-08-27 14:21:54 -0300
commit4d64dde1686a017ebe2763dd7880563a6fc51b53 (patch)
tree3a7f37ea4f92d30860a4ad260b62722719b81427
parentcbb50af72924c9b979844187dc622384e0547b8d (diff)
downloadmeta-freescale-4d64dde1686a017ebe2763dd7880563a6fc51b53.tar.gz
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 <tom.hochstein@nxp.com> (cherry picked from commit 2db7047ba40efed4d9e7c86c63d71158d974e297)
-rw-r--r--recipes-bsp/imx-mkimage/imx-boot_1.0.bb8
1 files 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 3f62920cb..a0b127ed5 100644
--- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
+++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
@@ -102,17 +102,19 @@ compile_mx8m() {
102 102
103 if [ "x${UBOOT_SIGN_ENABLE}" = "x1" ] ; then 103 if [ "x${UBOOT_SIGN_ENABLE}" = "x1" ] ; then
104 # Use DTB binary patched with signature node 104 # Use DTB binary patched with signature node
105 cp ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_BINARY} ${BOOT_STAGING}/${UBOOT_DTB_NAME_EXTRA} 105 cp ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_BINARY} ${BOOT_STAGING}/${UBOOT_DTB_NAME_EXTRA}
106 else 106 else
107 cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${UBOOT_DTB_NAME_EXTRA} ${BOOT_STAGING} 107 cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${UBOOT_DTB_NAME_EXTRA} \
108 ${BOOT_STAGING}
108 fi 109 fi
110 ln -sf ${UBOOT_DTB_NAME_EXTRA} ${BOOT_STAGING}/${UBOOT_DTB_NAME}
109 111
110 cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG_EXTRA} \ 112 cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG_EXTRA} \
111 ${BOOT_STAGING}/u-boot-nodtb.bin 113 ${BOOT_STAGING}/u-boot-nodtb.bin
112 114
113 cp ${DEPLOY_DIR_IMAGE}/${ATF_MACHINE_NAME} ${BOOT_STAGING}/bl31.bin 115 cp ${DEPLOY_DIR_IMAGE}/${ATF_MACHINE_NAME} ${BOOT_STAGING}/bl31.bin
114 116
115 cp ${DEPLOY_DIR_IMAGE}/${UBOOT_NAME_EXTRA} ${BOOT_STAGING}/u-boot.bin 117 cp ${DEPLOY_DIR_IMAGE}/${UBOOT_NAME_EXTRA} ${BOOT_STAGING}/u-boot.bin
116 118
117} 119}
118 120