From b4a26cce51cd8cfc015c63fa058383a9e0cc68a9 Mon Sep 17 00:00:00 2001 From: Loic Poulain Date: Fri, 1 Jul 2022 09:23:55 +0200 Subject: imx-boot: Use public key injected DTB when FIT signature is enabled When UBOOT_SIGN_ENABLE we want to use the DTB in which mkimage has added the signature node. Signed-off-by: Loic Poulain (cherry picked from commit 6824fc6603adfd2b0d4e7ef9d854120eec7b3129) --- recipes-bsp/imx-mkimage/imx-boot_1.0.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb index a16f482c..170fcfae 100644 --- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb +++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb @@ -7,7 +7,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" SECTION = "BSP" -inherit use-imx-security-controller-firmware +inherit use-imx-security-controller-firmware uboot-sign IMX_EXTRA_FIRMWARE = "firmware-imx-8 imx-sc-firmware imx-seco" IMX_EXTRA_FIRMWARE_mx8m = "firmware-imx-8m" @@ -98,6 +98,10 @@ compile_mx8m() { cp ${DEPLOY_DIR_IMAGE}/u-boot-spl.bin-${MACHINE}-${UBOOT_CONFIG} \ ${BOOT_STAGING}/u-boot-spl.bin cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${UBOOT_DTB_NAME} ${BOOT_STAGING} + if [ "x${UBOOT_SIGN_ENABLE}" = "x1" ] ; then + # Use DTB binary patched with signature node + cp ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_BINARY} ${BOOT_STAGING}/${UBOOT_DTB_NAME} + fi cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG} \ ${BOOT_STAGING}/u-boot-nodtb.bin cp ${STAGING_DIR_NATIVE}/${bindir}/mkimage ${BOOT_STAGING}/mkimage_uboot -- cgit v1.2.3-54-g00ecf