On 2/10/23 3:02 PM, Denys Dmytriyenko wrote:
On Tue, Feb 07, 2023 at 05:42:32PM -0600, Andrew Davis via
lists.yoctoproject.org wrote:
Use ti-k3-secdev native package to provide secure-binary-image.sh script
when it is not passed on as an environment variable. This fixes and issue
Fixes *an* issue
ACK
with AM64xx which is always HS but should not require TI_SECURE_DEV_PKG
when building for HS-FS platforms.
And GP?
AM64 is HS-FS only :)
But yes, this fixes GP building too. Will add to the message.
Signed-off-by: Andrew Davis <[email protected]>
---
meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
index 9a6da088..6c59b8ab 100644
--- a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
+++ b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
@@ -31,9 +31,11 @@ CLEANBROKEN = "1"
PR = "${INC_PR}.0"
# Secure Build
+include recipes-ti/includes/ti-paths.inc
Set TI_K3_SECDEV_INSTALL_DIR here instead of including ti-paths.inc?
Sure, and if we really do not like this include I can drop it everywhere
in the next spin.
DEPENDS += "openssl-native"
-
-TI_SECURE_DEV_PKG ?= ""
+DEPENDS:append = "${@ '' if d.getVar('TI_SECURE_DEV_PKG_K3') else '
ti-k3-secdev-native' }"
Should probably use DEPENDS += here instead of a generic :append override.
As :append and :remove are almost impossible to fight/override downstream,
it is recommended to use += whenever possible, like in this case...
I'm never really sure which is right, the docs all seem to say to use
:append/:remove when possible, but I can see it being a pain to override later..
Andrew
+TI_SECURE_DEV_PKG = "${@ d.getVar('TI_SECURE_DEV_PKG_K3') or
d.getVar('TI_K3_SECDEV_INSTALL_DIR') }"
+export TI_SECURE_DEV_PKG
RTOS_ETH_FW_DIR = "${S}/ti-eth/${PLAT_SFX}"
RTOS_DM_FW_DIR = "${S}/ti-dm/${PLAT_SFX}"
@@ -49,7 +51,6 @@ DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f"
# J721e HS support
do_install:prepend:j721e-hs-evm() {
- export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
( cd ${RTOS_DM_FW_DIR}; \
mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \
${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh
${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \
@@ -80,7 +81,6 @@ do_install:prepend:j721e-hs-evm() {
# J7200 HS support
do_install:prepend:j7200-hs-evm() {
- export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
( cd ${RTOS_DM_FW_DIR}; \
mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \
${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh
${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \
@@ -101,7 +101,6 @@ do_install:prepend:j7200-hs-evm() {
# J721s2 HS support
do_install:prepend:j721s2-hs-evm() {
- export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
( cd ${RTOS_DM_FW_DIR}; \
mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \
${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh
${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \
--
2.39.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#15806):
https://lists.yoctoproject.org/g/meta-ti/message/15806
Mute This Topic: https://lists.yoctoproject.org/mt/96819771/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
