diff options
author | Loic Poulain <loic.poulain@linaro.org> | 2022-07-01 09:23:55 +0200 |
---|---|---|
committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-07-01 11:29:06 +0000 |
commit | b4a26cce51cd8cfc015c63fa058383a9e0cc68a9 (patch) | |
tree | ceb027b01ad9e35b51fb71d4fc666344e7b93156 | |
parent | 3cb29cff92568ea835ef070490f185349d712837 (diff) | |
download | meta-freescale-b4a26cce51cd8cfc015c63fa058383a9e0cc68a9.tar.gz |
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.bb | 6 |
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 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" | |||
7 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" | 7 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" |
8 | SECTION = "BSP" | 8 | SECTION = "BSP" |
9 | 9 | ||
10 | inherit use-imx-security-controller-firmware | 10 | inherit use-imx-security-controller-firmware uboot-sign |
11 | 11 | ||
12 | IMX_EXTRA_FIRMWARE = "firmware-imx-8 imx-sc-firmware imx-seco" | 12 | IMX_EXTRA_FIRMWARE = "firmware-imx-8 imx-sc-firmware imx-seco" |
13 | IMX_EXTRA_FIRMWARE_mx8m = "firmware-imx-8m" | 13 | IMX_EXTRA_FIRMWARE_mx8m = "firmware-imx-8m" |
@@ -98,6 +98,10 @@ compile_mx8m() { | |||
98 | cp ${DEPLOY_DIR_IMAGE}/u-boot-spl.bin-${MACHINE}-${UBOOT_CONFIG} \ | 98 | cp ${DEPLOY_DIR_IMAGE}/u-boot-spl.bin-${MACHINE}-${UBOOT_CONFIG} \ |
99 | ${BOOT_STAGING}/u-boot-spl.bin | 99 | ${BOOT_STAGING}/u-boot-spl.bin |
100 | cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${UBOOT_DTB_NAME} ${BOOT_STAGING} | 100 | cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${UBOOT_DTB_NAME} ${BOOT_STAGING} |
101 | if [ "x${UBOOT_SIGN_ENABLE}" = "x1" ] ; then | ||
102 | # Use DTB binary patched with signature node | ||
103 | cp ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_BINARY} ${BOOT_STAGING}/${UBOOT_DTB_NAME} | ||
104 | fi | ||
101 | cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG} \ | 105 | cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG} \ |
102 | ${BOOT_STAGING}/u-boot-nodtb.bin | 106 | ${BOOT_STAGING}/u-boot-nodtb.bin |
103 | cp ${STAGING_DIR_NATIVE}/${bindir}/mkimage ${BOOT_STAGING}/mkimage_uboot | 107 | cp ${STAGING_DIR_NATIVE}/${bindir}/mkimage ${BOOT_STAGING}/mkimage_uboot |