summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2024-10-29 18:19:21 -0300
committerGitHub <noreply@github.com>2024-10-29 18:19:21 -0300
commit82b550e8ccec0045ddbe296f2e1b64f62a4502b7 (patch)
treecd643a2e4052637b3f4fb960be54e7cd262169a1
parent724fb423126f6d1ce7d0bc16799fd563ebcafecb (diff)
parent7da235fbdd3dc521f5bfd368770b9a30b959e689 (diff)
downloadmeta-freescale-82b550e8ccec0045ddbe296f2e1b64f62a4502b7.tar.gz
Merge pull request #2009 from esben/imx-boot-fix
imx-boot: Fix 8M non multi-config build problem
-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 3c027044d..63857fa65 100644
--- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
+++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
@@ -104,7 +104,9 @@ compile_mx8m() {
104 cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${UBOOT_DTB_NAME_EXTRA} \ 104 cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${UBOOT_DTB_NAME_EXTRA} \
105 ${BOOT_STAGING} 105 ${BOOT_STAGING}
106 fi 106 fi
107 ln -sf ${UBOOT_DTB_NAME_EXTRA} ${BOOT_STAGING}/${UBOOT_DTB_NAME} 107 if [ "${UBOOT_DTB_NAME_EXTRA}" != "${UBOOT_DTB_NAME}" ] ; then
108 ln -sf ${UBOOT_DTB_NAME_EXTRA} ${BOOT_STAGING}/${UBOOT_DTB_NAME}
109 fi
108 110
109 cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG_EXTRA} \ 111 cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG_EXTRA} \
110 ${BOOT_STAGING}/u-boot-nodtb.bin 112 ${BOOT_STAGING}/u-boot-nodtb.bin