From: "Paul Eggleton" <paul.eggleton@linux.microsoft.com>
To: openembedded-core@lists.openembedded.org
Cc: Usama Arif <usama.arif@arm.com>
Subject: [PATCH 3/8] classes/kernel-fitimage: allow substituting mkimage command
Date: Wed, 16 Dec 2020 18:51:37 -0800 [thread overview]
Message-ID: <f6dcfa11e8fa750e523b21025589962e1767eda5.1608173226.git.paul.eggleton@linux.microsoft.com> (raw)
In-Reply-To: <cover.1608173226.git.paul.eggleton@linux.microsoft.com>
From: Paul Eggleton <paul.eggleton@microsoft.com>
Add a UBOOT_MKIMAGE and UBOOT_MKIMAGE_SIGN variables to allow specifying
an alternative uboot-mkimage executable (or wrapper script/function).
Signed-off-by: Paul Eggleton <paul.eggleton@microsoft.com>
---
meta/classes/kernel-fitimage.bbclass | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index f3d18e2..08b5db2 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -75,6 +75,10 @@ FIT_KEY_SIGN_PKCS ?= "-x509"
# Description string
FIT_DESC ?= "U-Boot fitImage for ${DISTRO_NAME}/${PV}/${MACHINE}"
+# mkimage command
+UBOOT_MKIMAGE ?= "uboot-mkimage"
+UBOOT_MKIMAGE_SIGN ?= "${UBOOT_MKIMAGE}"
+
#
# Emit the fitImage ITS header
#
@@ -505,7 +509,7 @@ fitimage_assemble() {
#
# Step 6: Assemble the image
#
- uboot-mkimage \
+ ${UBOOT_MKIMAGE} \
${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \
-f ${1} \
arch/${ARCH}/boot/${2}
@@ -521,7 +525,7 @@ fitimage_assemble() {
cp -P ${STAGING_DATADIR}/u-boot*.dtb ${B}
add_key_to_u_boot="-K ${B}/${UBOOT_DTB_BINARY}"
fi
- uboot-mkimage \
+ ${UBOOT_MKIMAGE_SIGN} \
${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \
-F -k "${UBOOT_SIGN_KEYDIR}" \
$add_key_to_u_boot \
--
1.8.3.1
next prev parent reply other threads:[~2020-12-17 2:52 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-17 2:51 [PATCH 0/8] kernel-fitimage extensions Paul Eggleton
2020-12-17 2:51 ` [PATCH 1/8] classes/kernel-fitimage: add variable for description Paul Eggleton
2020-12-17 2:51 ` [PATCH 2/8] classes/kernel-fitimage: make fitimage_emit_section_config more readable Paul Eggleton
2020-12-17 2:51 ` Paul Eggleton [this message]
2020-12-17 2:51 ` [PATCH 4/8] classes/kernel-fitimage: add ability to add additional signing options Paul Eggleton
2020-12-17 2:51 ` [PATCH 5/8] classes/kernel-fitimage: add ability to sign individual images Paul Eggleton
2020-12-17 2:51 ` [PATCH 6/8] oe-selftest: move FIT image tests to their own module Paul Eggleton
2020-12-17 2:51 ` [PATCH 7/8] oe-selftest: fitimage: Test for FIT_DESC Paul Eggleton
2020-12-17 2:51 ` [PATCH 8/8] oe-selftest: fitimage: add test for signing FIT images Paul Eggleton
2021-01-01 13:33 ` [PATCH 0/8] kernel-fitimage extensions Usama Arif
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f6dcfa11e8fa750e523b21025589962e1767eda5.1608173226.git.paul.eggleton@linux.microsoft.com \
--to=paul.eggleton@linux.microsoft.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=usama.arif@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox