From: Andrew Davis <afd@ti.com>
To: Denys Dmytriyenko <denys@konsulko.com>,
Ryan Eatmon <reatmon@ti.com>, <meta-ti@lists.yoctoproject.org>
Cc: Andrew Davis <afd@ti.com>
Subject: [meta-ti][master/kirkstone][PATCH v2 02/15] trusted-firmware-a: Use new ti-secdev class to sign the images
Date: Wed, 15 Feb 2023 13:33:42 -0600 [thread overview]
Message-ID: <20230215193355.9676-3-afd@ti.com> (raw)
In-Reply-To: <20230215193355.9676-1-afd@ti.com>
Use the new ti-k3-secdev package to pull in the signing tools if they are
not provided by the environment. This allows us to use these tools
unconditionally. Remove the checks for the script and do the signing
for all K3 machines. The signature is automatically stripped from
the binaries on non-HS devices at boot time as needed so this change
is harmless for GP devices.
Signed-off-by: Andrew Davis <afd@ti.com>
---
.../trusted-firmware-a_%.bbappend | 39 ++++---------------
1 file changed, 7 insertions(+), 32 deletions(-)
diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
index 5acc5c2e..be601e62 100644
--- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
+++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
@@ -6,39 +6,14 @@ TFA_BUILD_TARGET:k3 = "all"
TFA_INSTALL_TARGET:k3 = "bl31"
TFA_SPD:k3 = "opteed"
+# Use TI SECDEV for signing
+inherit ti-secdev
+
EXTRA_OEMAKE:append:k3 = "${@ ' K3_USART=' + d.getVar('TFA_K3_USART') if d.getVar('TFA_K3_USART') else ''}"
EXTRA_OEMAKE:append:k3 = "${@ ' K3_PM_SYSTEM_SUSPEND=' + d.getVar('TFA_K3_SYSTEM_SUSPEND') if d.getVar('TFA_K3_SYSTEM_SUSPEND') else ''}"
-# Signing procedure for K3 HS devices
-tfa_sign_k3hs() {
- export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
- ( cd ${BUILD_DIR}; \
- mv bl31.bin bl31.bin.unsigned; \
- if [ -f ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ]; then \
- ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh bl31.bin.unsigned bl31.bin; \
- else \
- echo "Warning: TI_SECURE_DEV_PKG not set, TF-A not signed."; \
- cp bl31.bin.unsigned bl31.bin; \
- fi; \
- )
-}
-
-do_compile:append:am65xx-hs-evm() {
- tfa_sign_k3hs
-}
-
-do_compile:append:am64xx-evm() {
- tfa_sign_k3hs
-}
-
-do_compile:append:j721e-hs-evm() {
- tfa_sign_k3hs
-}
-
-do_compile:append:j7200-hs-evm() {
- tfa_sign_k3hs
-}
-
-do_compile:append:j721s2-hs-evm() {
- tfa_sign_k3hs
+# Signing procedure for K3 devices
+do_compile:append:k3() {
+ mv ${BUILD_DIR}/bl31.bin ${BUILD_DIR}/bl31.bin.unsigned
+ ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${BUILD_DIR}/bl31.bin.unsigned ${BUILD_DIR}/bl31.bin
}
--
2.39.1
next prev parent reply other threads:[~2023-02-15 19:34 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-15 19:33 [meta-ti][master/kirkstone][PATCH v2 00/15] ti-rtos-firmware and secdev Andrew Davis
2023-02-15 19:33 ` [meta-ti][master/kirkstone][PATCH v2 01/15] meta-ti-bsp: Add helper class for TI Security Development Tools Andrew Davis
2023-02-22 19:36 ` Denys Dmytriyenko
2023-02-15 19:33 ` Andrew Davis [this message]
2023-02-22 19:37 ` [meta-ti][master/kirkstone][PATCH v2 02/15] trusted-firmware-a: Use new ti-secdev class to sign the images Denys Dmytriyenko
2023-02-15 19:33 ` [meta-ti][master/kirkstone][PATCH v2 03/15] optee-os: " Andrew Davis
2023-02-22 19:38 ` Denys Dmytriyenko
2023-02-15 19:33 ` [meta-ti][master/kirkstone][PATCH v2 04/15] u-boot-ti: " Andrew Davis
2023-02-22 19:38 ` Denys Dmytriyenko
2023-02-15 19:33 ` [meta-ti][master/kirkstone][PATCH v2 05/15] ti-rtos-firmware: " Andrew Davis
2023-02-22 19:39 ` Denys Dmytriyenko
2023-02-15 19:33 ` [meta-ti][master/kirkstone][PATCH v2 06/15] ti-sci-fw: " Andrew Davis
2023-02-22 19:39 ` Denys Dmytriyenko
2023-02-15 19:33 ` [meta-ti][master/kirkstone][PATCH v2 07/15] conf: machine: k3: Remove unneeded TI_SECURE_DEV_PKG_K3 assignments Andrew Davis
2023-02-22 19:40 ` Denys Dmytriyenko
2023-02-15 19:33 ` [meta-ti][master/kirkstone][PATCH v2 08/15] ti-k3-secdev: Remove inclusion of ti-paths.inc Andrew Davis
2023-02-22 19:41 ` Denys Dmytriyenko
2023-02-15 19:33 ` [meta-ti][master/kirkstone][PATCH v2 09/15] ti-rtos-firmware: Remove unneeded per-machine TARGET defines Andrew Davis
2023-02-22 19:41 ` Denys Dmytriyenko
2023-02-15 19:33 ` [meta-ti][master/kirkstone][PATCH v2 10/15] ti-rtos-firmware: Fix name for AM64x and AM62x firmware Andrew Davis
2023-02-22 19:42 ` Denys Dmytriyenko
2023-02-15 19:33 ` [meta-ti][master/kirkstone][PATCH v2 11/15] ti-rtos-firmware: Do not break the source directory by renaming files Andrew Davis
2023-02-22 19:42 ` Denys Dmytriyenko
2023-02-15 19:33 ` [meta-ti][master/kirkstone][PATCH v2 12/15] ti-rtos-firmware: Use defines to set firmware names Andrew Davis
2023-02-22 19:43 ` Denys Dmytriyenko
2023-02-15 19:33 ` [meta-ti][master/kirkstone][PATCH v2 13/15] ti-rtos-firmware: Use a table instead of a list of copy commands Andrew Davis
2023-02-22 19:43 ` Denys Dmytriyenko
2023-02-15 19:33 ` [meta-ti][master/kirkstone][PATCH v2 14/15] ti-rtos-firmware: Fix use of base_libdir with nonarch_base_libdir Andrew Davis
2023-02-22 19:44 ` Denys Dmytriyenko
2023-02-15 19:33 ` [meta-ti][master/kirkstone][PATCH v2 15/15] ti-rtos-firmware: Deploy secure firmware unconditionally Andrew Davis
2023-02-22 19:44 ` Denys Dmytriyenko
2023-02-17 7:09 ` [meta-ti][master/kirkstone][PATCH v2 00/15] ti-rtos-firmware and secdev Denys Dmytriyenko
2023-02-18 4:09 ` Ryan Eatmon
2023-02-21 20:51 ` Denys Dmytriyenko
2023-02-21 21:12 ` Andrew Davis
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=20230215193355.9676-3-afd@ti.com \
--to=afd@ti.com \
--cc=denys@konsulko.com \
--cc=meta-ti@lists.yoctoproject.org \
--cc=reatmon@ti.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.