summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEsben Haabendal <esben@geanix.com>2024-10-29 21:27:13 +0100
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2024-10-29 21:19:35 +0000
commitc6f4b3c6e6e54d8fe0c892ece75dca2102ab04c2 (patch)
tree8a19882031e3a2cebaa41a84317380f65ce41bc8
parent4aad8fe275e9939de9467bb3f2b25fbd4d3c2838 (diff)
downloadmeta-freescale-c6f4b3c6e6e54d8fe0c892ece75dca2102ab04c2.tar.gz
imx-boot: Fix 8M non multi-config build problem
The fix made in commit 2db7047ba40e ("imx-boot: Fix 8M multi-config build problems") broke builds not using U-Boot multi-config, as the link created ends up being a simple recursive link when UBOOT_DTB_NAME_EXTRA is the same as UBOOT_DTB_NAME. It fails with something like this: ``` | ./../scripts/dtb_check.sh imx8mq-evk.dtb evk.dtb imx8mq-var-dart-dt8mcustomboard.dtb | Can't find u-boot DTB file, please copy from u-boot ``` caused by a symlink like this: ``` lrwxrwxrwx 1 esben 1000001 35 Oct 29 21:32 imx8mq-var-dart-dt8mcustomboard.dtb -> imx8mq-var-dart-dt8mcustomboard.dtb ``` Fixes: 2db7047ba40e ("imx-boot: Fix 8M multi-config build problems") Signed-off-by: Esben Haabendal <esben@geanix.com> (cherry picked from commit 7da235fbdd3dc521f5bfd368770b9a30b959e689)
-rw-r--r--recipes-bsp/imx-mkimage/imx-boot_1.0.bb4
1 files changed, 3 insertions, 1 deletions
diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
index cd4063aa6..39b07cd74 100644
--- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
+++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
@@ -105,7 +105,9 @@ compile_mx8m() {
105 cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${UBOOT_DTB_NAME_EXTRA} \ 105 cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${UBOOT_DTB_NAME_EXTRA} \
106 ${BOOT_STAGING} 106 ${BOOT_STAGING}
107 fi 107 fi
108 ln -sf ${UBOOT_DTB_NAME_EXTRA} ${BOOT_STAGING}/${UBOOT_DTB_NAME} 108 if [ "${UBOOT_DTB_NAME_EXTRA}" != "${UBOOT_DTB_NAME}" ] ; then
109 ln -sf ${UBOOT_DTB_NAME_EXTRA} ${BOOT_STAGING}/${UBOOT_DTB_NAME}
110 fi
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