| Message ID | 20230208231031.16363-3-afd@ti.com |
|---|---|
| State | Superseded |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-ti,master/kirkstone,1/4] trusted-firmware-a: Use ti-k3-secdev if TI_SECURE_DEV_PKG_K3 is not defined | expand |
On Wed, Feb 08, 2023 at 05:10:30PM -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. 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> > --- > meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc > index 6f5b6313..ae87ec6a 100644 > --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc > +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc > @@ -24,6 +24,7 @@ PV:append = "+git${SRCPV}" > > # u-boot needs devtree compiler to parse dts files > DEPENDS += "dtc-native bc-native lzop-native flex-native bison-native python3-setuptools-native" > +DEPENDS:append:k3 = "${@ '' if d.getVar('TI_SECURE_DEV_PKG_K3') else ' ti-k3-secdev-native' }" > > DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f" > > @@ -49,8 +50,13 @@ PKG:${PN}-dbg = "u-boot-dbg" > > S = "${WORKDIR}/git" > > +# 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 Here as well > + > # Support for secure devices - detailed info is in doc/README.ti-secure > TI_SECURE_DEV_PKG ?= "" > +TI_SECURE_DEV_PKG:k3 = "${@ d.getVar('TI_SECURE_DEV_PKG_K3') or d.getVar('TI_K3_SECDEV_INSTALL_DIR') }" > export TI_SECURE_DEV_PKG > > SYSROOT_DIRS += "/boot" > -- > 2.39.1
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc index 6f5b6313..ae87ec6a 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc @@ -24,6 +24,7 @@ PV:append = "+git${SRCPV}" # u-boot needs devtree compiler to parse dts files DEPENDS += "dtc-native bc-native lzop-native flex-native bison-native python3-setuptools-native" +DEPENDS:append:k3 = "${@ '' if d.getVar('TI_SECURE_DEV_PKG_K3') else ' ti-k3-secdev-native' }" DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f" @@ -49,8 +50,13 @@ PKG:${PN}-dbg = "u-boot-dbg" S = "${WORKDIR}/git" +# 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 + # Support for secure devices - detailed info is in doc/README.ti-secure TI_SECURE_DEV_PKG ?= "" +TI_SECURE_DEV_PKG:k3 = "${@ d.getVar('TI_SECURE_DEV_PKG_K3') or d.getVar('TI_K3_SECDEV_INSTALL_DIR') }" export TI_SECURE_DEV_PKG SYSROOT_DIRS += "/boot"
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> --- meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 6 ++++++ 1 file changed, 6 insertions(+)