From b0ef3ea14fb34229b8d5540e4986341b925e15ff Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Tue, 11 Feb 2020 12:09:47 +0100 Subject: [PATCH] imx-mkimage: install mkimage_imx8 binaries to BOOT_TOOLS This binary is required for signing the U-Boot scripts generated by the U-Boot recipe but it wasn't available because this recipe was not installing it anywhere. At the same time, remove the installation from imx-boot, to avoid a conflict between the two (imx-mkimage is a dependency from imx-boot anyway). Signed-off-by: Hector Palacios --- meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_0.2.bbappend | 1 - .../recipes-bsp/imx-mkimage/imx-mkimage_%.bbappend | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_0.2.bbappend b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_0.2.bbappend index 8ac1cda2d..a66c824f0 100644 --- a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_0.2.bbappend +++ b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_0.2.bbappend @@ -160,7 +160,6 @@ do_deploy () { install -m 0644 ${BOOT_STAGING}/m40_tcm.bin ${DEPLOYDIR}/${BOOT_TOOLS} install -m 0644 ${BOOT_STAGING}/m4_image.bin ${DEPLOYDIR}/${BOOT_TOOLS} fi - install -m 0755 ${S}/${TOOLS_NAME} ${DEPLOYDIR}/${BOOT_TOOLS} # copy makefile (soc.mak) for reference install -m 0644 ${BOOT_STAGING}/soc.mak ${DEPLOYDIR}/${BOOT_TOOLS} diff --git a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_%.bbappend b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_%.bbappend index 079e27b22..95f53f04c 100644 --- a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_%.bbappend +++ b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_%.bbappend @@ -3,3 +3,9 @@ # Use the v4.14 ga BSP branch SRCBRANCH = "imx_4.14.98_2.3.0" SRCREV = "2556000499f667123094af22326cfd8e4cbadaac" + +do_deploy_append () { + install -d ${DEPLOYDIR}/${BOOT_TOOLS} + install -m 0755 ${S}/iMX8M/mkimage_imx8 ${DEPLOYDIR}/${BOOT_TOOLS}/mkimage_imx8m + install -m 0755 ${S}/mkimage_imx8 ${DEPLOYDIR}/${BOOT_TOOLS}/mkimage_imx8 +}