summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2024-10-29 18:20:00 -0300
committerGitHub <noreply@github.com>2024-10-29 18:20:00 -0300
commit585b40d35db75ebe93482c8951ef0827435f7b6f (patch)
tree8a19882031e3a2cebaa41a84317380f65ce41bc8
parent4aad8fe275e9939de9467bb3f2b25fbd4d3c2838 (diff)
parentc6f4b3c6e6e54d8fe0c892ece75dca2102ab04c2 (diff)
downloadmeta-freescale-585b40d35db75ebe93482c8951ef0827435f7b6f.tar.gz
Merge pull request #2010 from Freescale/backport-2009-to-scarthgap
[Backport scarthgap] 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 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