| Message ID | 20230215193355.9676-7-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:46PM -0600, Andrew Davis via lists.yoctoproject.org wrote: > Use the new ti-k3-secdev package to pull in the signing tools if they are > not provided by the environment. > > Signed-off-by: Andrew Davis <afd@ti.com> Tested-by: Denys Dmytriyenko <denys@konsulko.com> > --- > meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb > index 578f56b8..46d5111d 100644 > --- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb > +++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb > @@ -1,7 +1,4 @@ > require recipes-bsp/ti-linux-fw/ti-linux-fw.inc > -# set a default value for TI_K3_SECDEV_INSTALL_DIR > -export TI_K3_SECDEV_INSTALL_DIR = "${STAGING_DIR_NATIVE}${datadir}/ti/ti-k3-secdev" > -include recipes-ti/includes/ti-paths.inc > > DEPENDS = "openssl-native u-boot-mkimage-native dtc-native virtual/bootloader" > DEPENDS:remove:am65xx-evm-k3r5 = "virtual/bootloader" > @@ -12,7 +9,6 @@ DEPENDS:remove:j721e-evm-k3r5 = "virtual/bootloader" > DEPENDS:remove:j721e-hs-evm-k3r5 = "virtual/bootloader" > DEPENDS:remove:j721e-hs-evm-k3r5-sr1-1 = "virtual/bootloader" > DEPENDS:remove:beaglebone-ai64-k3r5 = "virtual/bootloader" > -DEPENDS:append = "${@ '' if d.getVar('TI_SECURE_DEV_PKG_K3') else ' ti-k3-secdev-native' }" > > CLEANBROKEN = "1" > PR = "${INC_PR}.2" > @@ -23,8 +19,8 @@ COMPATIBLE_MACHINE:aarch64 = "null" > > PACKAGE_ARCH = "${MACHINE_ARCH}" > > -TI_SECURE_DEV_PKG = "${@ d.getVar('TI_SECURE_DEV_PKG_K3') or d.getVar('TI_K3_SECDEV_INSTALL_DIR') }" > -export TI_SECURE_DEV_PKG > +# Use TI SECDEV for signing > +inherit ti-secdev > > SYSFW_SOC ?= "unknown" > SYSFW_SUFFIX ?= "unknown" > -- > 2.39.1
diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb index 578f56b8..46d5111d 100644 --- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb @@ -1,7 +1,4 @@ require recipes-bsp/ti-linux-fw/ti-linux-fw.inc -# set a default value for TI_K3_SECDEV_INSTALL_DIR -export TI_K3_SECDEV_INSTALL_DIR = "${STAGING_DIR_NATIVE}${datadir}/ti/ti-k3-secdev" -include recipes-ti/includes/ti-paths.inc DEPENDS = "openssl-native u-boot-mkimage-native dtc-native virtual/bootloader" DEPENDS:remove:am65xx-evm-k3r5 = "virtual/bootloader" @@ -12,7 +9,6 @@ DEPENDS:remove:j721e-evm-k3r5 = "virtual/bootloader" DEPENDS:remove:j721e-hs-evm-k3r5 = "virtual/bootloader" DEPENDS:remove:j721e-hs-evm-k3r5-sr1-1 = "virtual/bootloader" DEPENDS:remove:beaglebone-ai64-k3r5 = "virtual/bootloader" -DEPENDS:append = "${@ '' if d.getVar('TI_SECURE_DEV_PKG_K3') else ' ti-k3-secdev-native' }" CLEANBROKEN = "1" PR = "${INC_PR}.2" @@ -23,8 +19,8 @@ COMPATIBLE_MACHINE:aarch64 = "null" PACKAGE_ARCH = "${MACHINE_ARCH}" -TI_SECURE_DEV_PKG = "${@ d.getVar('TI_SECURE_DEV_PKG_K3') or d.getVar('TI_K3_SECDEV_INSTALL_DIR') }" -export TI_SECURE_DEV_PKG +# Use TI SECDEV for signing +inherit ti-secdev SYSFW_SOC ?= "unknown" SYSFW_SUFFIX ?= "unknown"
Use the new ti-k3-secdev package to pull in the signing tools if they are not provided by the environment. Signed-off-by: Andrew Davis <afd@ti.com> --- meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)