Skip to content

u-boot-stm32mp: Fix fit signing #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
UVV-gh wants to merge 1 commit into
base: scarthgap
Choose a base branch
from
+6 −2
Open

u-boot-stm32mp: Fix fit signing #105

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions recipes-bsp/u-boot/u-boot-stm32mp.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,8 @@ export_binaries() {
# Prepare original binary for signature
cp -f ${B}/${config}/u-boot-${devicetree}-${type_suffix}.${binarysuffix} ${dest}/u-boot-${devicetree}-${type_suffix}-without-signature.${binarysuffix}
# Sign dummy image images in order to add the image signing keys to our dtb
${UBOOT_MKIMAGE_SIGN} \
if [ "${FIT_SIGN_INDIVIDUAL}" = "1" ] ; then
${UBOOT_MKIMAGE_SIGN} \
${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \
-f auto \
-k "${UBOOT_SIGN_KEYDIR}" \
Expand All @@ -220,13 +221,14 @@ export_binaries() {
-d /dev/null \
${UBOOT_MKIMAGE_SIGN_ARGS} \
-r ${B}/${config}/unused.itb
fi
# Sign dummy image configurations in order to add the configuration signing keys to our dtb
${UBOOT_MKIMAGE_SIGN} \
${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \
-f auto-conf \
-k "${UBOOT_SIGN_KEYDIR}" \
-o "${FIT_HASH_ALG},${FIT_SIGN_ALG}" \
-g "${UBOOT_SIGN_IMG_KEYNAME}" \
-g "${UBOOT_SIGN_KEYNAME}" \
-K "${B}/${config}/u-boot-${devicetree}-${type_suffix}.${binarysuffix}" \
-d /dev/null \
${UBOOT_MKIMAGE_SIGN_ARGS} \
Expand All @@ -247,6 +249,8 @@ export_binaries() {
fi
}

do_uboot_assemble_fitimage[noexec] = "1"

do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}${FIP_DIR_UBOOT}"
do_deploy() {
export_binaries ${DEPLOYDIR} 1
Expand Down