| Message ID | 20230215193355.9676-6-afd@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | ti-rtos-firmware and secdev | expand |
On Wed, Feb 15, 2023 at 01:33:45PM -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 an issue > with AM64xx which is always HS but should not require TI_SECURE_DEV_PKG > when building for HS-FS or GP platforms. > > Signed-off-by: Andrew Davis <afd@ti.com> Tested-by: Denys Dmytriyenko <denys@konsulko.com> > --- > meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb | 7 +------ > 1 file changed, 1 insertion(+), 6 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..fddb5e2e 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,7 @@ CLEANBROKEN = "1" > PR = "${INC_PR}.0" > > # Secure Build > -DEPENDS += "openssl-native" > - > -TI_SECURE_DEV_PKG ?= "" > +inherit ti-secdev > > RTOS_ETH_FW_DIR = "${S}/ti-eth/${PLAT_SFX}" > RTOS_DM_FW_DIR = "${S}/ti-dm/${PLAT_SFX}" > @@ -49,7 +47,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 +77,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 +97,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
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..fddb5e2e 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,7 @@ CLEANBROKEN = "1" PR = "${INC_PR}.0" # Secure Build -DEPENDS += "openssl-native" - -TI_SECURE_DEV_PKG ?= "" +inherit ti-secdev RTOS_ETH_FW_DIR = "${S}/ti-eth/${PLAT_SFX}" RTOS_DM_FW_DIR = "${S}/ti-dm/${PLAT_SFX}" @@ -49,7 +47,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 +77,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 +97,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}; \
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 an issue with AM64xx which is always HS but should not require TI_SECURE_DEV_PKG when building for HS-FS or GP platforms. Signed-off-by: Andrew Davis <afd@ti.com> --- meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)