diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2020-10-21 15:48:48 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-10-23 10:43:53 +0200 |
| commit | fca85306b40067ed7007d546cf25805e8c78e0c4 (patch) | |
| tree | cf6db565e52cae934449cdf3c40644789553a85f /recipes-bsp | |
| parent | 675ce7c63f982820cf2b50e9f4d083213e6ea9df (diff) | |
u-boot: no longer deploy mkimage into the deploy folder
meta-freescale does that now in imx-boot resulting in the following bitbake
error:
| ERROR: imx-boot-1.0-r0 do_deploy_setscene: The recipe imx-boot is trying to install files into a shared area when those files already exist. Those files and their manifest location are:
| /build/krm/oe-core_master/build/deploy/images/verdin-imx8mm/imx-boot-tools/mkimage_uboot
| (matched in manifest-verdin_imx8mm-u-boot-toradex.deploy)
Related-to: ELB-3081
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'recipes-bsp')
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-toradex-common.inc | 3 | ||||
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-toradex-common_2020.04.inc | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/recipes-bsp/u-boot/u-boot-toradex-common.inc b/recipes-bsp/u-boot/u-boot-toradex-common.inc index b9f244a..901fd2b 100644 --- a/recipes-bsp/u-boot/u-boot-toradex-common.inc +++ b/recipes-bsp/u-boot/u-boot-toradex-common.inc @@ -26,7 +26,7 @@ S = "${WORKDIR}/git" UBOOT_INITIAL_ENV = "u-boot-initial-env" do_deploy_append_mx8m() { - # Deploy the mkimage, u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary + # Deploy the u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary if [ -n "${UBOOT_CONFIG}" ] then for config in ${UBOOT_MACHINE}; do @@ -37,7 +37,6 @@ do_deploy_append_mx8m() { then install -d ${DEPLOYDIR}/${BOOT_TOOLS} install -m 0777 ${B}/${config}/arch/arm/dts/${UBOOT_DTB_NAME} ${DEPLOYDIR}/${BOOT_TOOLS} - install -m 0777 ${B}/${config}/tools/mkimage ${DEPLOYDIR}/${BOOT_TOOLS}/mkimage_uboot install -m 0777 ${B}/${config}/u-boot-nodtb.bin ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG} fi done diff --git a/recipes-bsp/u-boot/u-boot-toradex-common_2020.04.inc b/recipes-bsp/u-boot/u-boot-toradex-common_2020.04.inc index c8e41ce..d42081f 100644 --- a/recipes-bsp/u-boot/u-boot-toradex-common_2020.04.inc +++ b/recipes-bsp/u-boot/u-boot-toradex-common_2020.04.inc @@ -24,7 +24,7 @@ COMPATIBLE_MACHINE = "(mx8)" PACKAGE_ARCH = "${MACHINE_ARCH}" do_deploy_append_mx8m() { - # Deploy the mkimage, u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary + # Deploy the u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary if [ -n "${UBOOT_CONFIG}" ] then for config in ${UBOOT_MACHINE}; do @@ -35,7 +35,6 @@ do_deploy_append_mx8m() { then install -d ${DEPLOYDIR}/${BOOT_TOOLS} install -m 0777 ${B}/${config}/arch/arm/dts/${UBOOT_DTB_NAME} ${DEPLOYDIR}/${BOOT_TOOLS} - install -m 0777 ${B}/${config}/tools/mkimage ${DEPLOYDIR}/${BOOT_TOOLS}/mkimage_uboot install -m 0777 ${B}/${config}/u-boot-nodtb.bin ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG} fi done |