aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoic Poulain <loic.poulain@linaro.org>2022-07-01 09:23:55 +0200
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2022-07-01 11:27:54 +0000
commitf1a3d00c52073a9aa5fccbc9b704164c49f89daa (patch)
tree0bc5f1f987c7da8a96dc545680feca629fca60b9
parent270f0f6f046187036716aedcae0636011172b447 (diff)
downloadmeta-freescale-f1a3d00c52073a9aa5fccbc9b704164c49f89daa.tar.gz
meta-freescale-f1a3d00c52073a9aa5fccbc9b704164c49f89daa.tar.bz2
meta-freescale-f1a3d00c52073a9aa5fccbc9b704164c49f89daa.zip
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 <loic.poulain@linaro.org> (cherry picked from commit 6824fc6603adfd2b0d4e7ef9d854120eec7b3129)
-rw-r--r--recipes-bsp/imx-mkimage/imx-boot_1.0.bb6
1 files changed, 5 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 28bc88b8..f35561de 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 = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;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-generic-bsp = "firmware-imx-8m"
@@ -86,6 +86,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 ${DEPLOY_DIR_IMAGE}/${ATF_MACHINE_NAME} ${BOOT_STAGING}/bl31.bin