Message ID | 20230511184301.1075335-2-denis@denix.org |
---|---|
State | Accepted |
Delegated to: | Ryan Eatmon |
Headers | show |
Series | [master/kirkstone,1/2] optee-os: only activate customizations for TI platforms | expand |
This does not apply against kirkstone cleanly because of a patch applied to the master recipe that is not in kirkstone. I'll fix it as I apply the patch, but I wanted to inform anyone trying it themselves. On 5/11/2023 1:43 PM, Denys Dmytriyenko wrote: > From: Denys Dmytriyenko <denys@konsulko.com> > > Avoid inheriting ti-secdev class and adding unconditional dependency > on TI_SECURE_DEV_PKG and other variables, when meta-ti-bsp is in the > bblayers.conf stack, but not building for TI platforms. This solves > yocto-check-layer signature test for Yocto Project compliance. > > Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> > --- > ...a_%.bbappend => trusted-firmware-a-ti.inc} | 0 > .../trusted-firmware-a_%.bbappend | 72 +------------------ > 2 files changed, 3 insertions(+), 69 deletions(-) > copy meta-ti-bsp/recipes-bsp/trusted-firmware-a/{trusted-firmware-a_%.bbappend => trusted-firmware-a-ti.inc} (100%) > > 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-ti.inc > similarity index 100% > copy from meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend > copy to meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc > 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 4ea63205..00d08a51 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 > @@ -1,70 +1,4 @@ > -PV:k3 = "2.8+git${SRCPV}" > -SRCREV_tfa:k3 = "2fcd408bb3a6756767a43c073c597cef06e7f2d5" > -SRC_URI:k3 = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master" > -COMPATIBLE_MACHINE:k3 = "k3" > -TFA_BUILD_TARGET:k3 = "all" > -TFA_INSTALL_TARGET:k3 = "bl31" > -TFA_SPD:k3 = "opteed" > +TFA_TI = "" > +TFA_TI:k3 = "trusted-firmware-a-ti.inc" > > -SRC_URI:append:k3 = " file://rwx-segments-ti.patch" > -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" > - > -# 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() { > - 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 > -} > - > -do_compile:append:am65xx-hs-evm() { > - tfa_sign_k3hs > -} > - > -do_compile:append:am64xx-evm() { > - tfa_sign_k3hs > -} > - > -do_compile:append:am62xx-evm() { > - tfa_sign_k3hs > -} > - > -do_compile:append:am62xx-lp-evm() { > - tfa_sign_k3hs > -} > - > -do_compile:append:am62axx-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 > -} > - > -do_compile:append:j784s4-hs-evm() { > - tfa_sign_k3hs > -} > - > -do_install:append:k3() { > - if [ -f ${BUILD_DIR}/bl31.bin.unsigned ]; then > - echo "Install bl31.bin.unsigned" > - install -m 0644 ${BUILD_DIR}/bl31.bin.unsigned \ > - ${D}/firmware/bl31.bin.unsigned > - else > - echo "Install bl31.bin.unsigned" > - install -m 0644 ${BUILD_DIR}/bl31.bin \ > - ${D}/firmware/bl31.bin.unsigned > - fi > -} > +require ${TFA_TI} > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#16518): https://lists.yoctoproject.org/g/meta-ti/message/16518 > Mute This Topic: https://lists.yoctoproject.org/mt/98834090/6551054 > Group Owner: meta-ti+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/leave/10828724/6551054/1815494134/xyzzy [reatmon@ti.com] > -=-=-=-=-=-=-=-=-=-=-=- >
Sorry about all that - I can resend everything specifically for kirkstone On Thu, May 11, 2023 at 02:46:11PM -0500, Ryan Eatmon via lists.yoctoproject.org wrote: > > This does not apply against kirkstone cleanly because of a patch > applied to the master recipe that is not in kirkstone. I'll fix it > as I apply the patch, but I wanted to inform anyone trying it > themselves. > > > On 5/11/2023 1:43 PM, Denys Dmytriyenko wrote: > >From: Denys Dmytriyenko <denys@konsulko.com> > > > >Avoid inheriting ti-secdev class and adding unconditional dependency > >on TI_SECURE_DEV_PKG and other variables, when meta-ti-bsp is in the > >bblayers.conf stack, but not building for TI platforms. This solves > >yocto-check-layer signature test for Yocto Project compliance. > > > >Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> > >--- > > ...a_%.bbappend => trusted-firmware-a-ti.inc} | 0 > > .../trusted-firmware-a_%.bbappend | 72 +------------------ > > 2 files changed, 3 insertions(+), 69 deletions(-) > > copy meta-ti-bsp/recipes-bsp/trusted-firmware-a/{trusted-firmware-a_%.bbappend => trusted-firmware-a-ti.inc} (100%) > > > >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-ti.inc > >similarity index 100% > >copy from meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend > >copy to meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc > >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 4ea63205..00d08a51 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 > >@@ -1,70 +1,4 @@ > >-PV:k3 = "2.8+git${SRCPV}" > >-SRCREV_tfa:k3 = "2fcd408bb3a6756767a43c073c597cef06e7f2d5" > >-SRC_URI:k3 = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master" > >-COMPATIBLE_MACHINE:k3 = "k3" > >-TFA_BUILD_TARGET:k3 = "all" > >-TFA_INSTALL_TARGET:k3 = "bl31" > >-TFA_SPD:k3 = "opteed" > >+TFA_TI = "" > >+TFA_TI:k3 = "trusted-firmware-a-ti.inc" > >-SRC_URI:append:k3 = " file://rwx-segments-ti.patch" > >-FILESEXTRAPATHS:prepend := "${THISDIR}/files:" > >- > >-# 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() { > >- 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 > >-} > >- > >-do_compile:append:am65xx-hs-evm() { > >- tfa_sign_k3hs > >-} > >- > >-do_compile:append:am64xx-evm() { > >- tfa_sign_k3hs > >-} > >- > >-do_compile:append:am62xx-evm() { > >- tfa_sign_k3hs > >-} > >- > >-do_compile:append:am62xx-lp-evm() { > >- tfa_sign_k3hs > >-} > >- > >-do_compile:append:am62axx-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 > >-} > >- > >-do_compile:append:j784s4-hs-evm() { > >- tfa_sign_k3hs > >-} > >- > >-do_install:append:k3() { > >- if [ -f ${BUILD_DIR}/bl31.bin.unsigned ]; then > >- echo "Install bl31.bin.unsigned" > >- install -m 0644 ${BUILD_DIR}/bl31.bin.unsigned \ > >- ${D}/firmware/bl31.bin.unsigned > >- else > >- echo "Install bl31.bin.unsigned" > >- install -m 0644 ${BUILD_DIR}/bl31.bin \ > >- ${D}/firmware/bl31.bin.unsigned > >- fi > >-} > >+require ${TFA_TI} > > > > > > > > > > > > -- > Ryan Eatmon reatmon@ti.com > ----------------------------------------- > Texas Instruments, Inc. - LCPD - MGTS > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#16521): https://lists.yoctoproject.org/g/meta-ti/message/16521 > Mute This Topic: https://lists.yoctoproject.org/mt/98834090/3617104 > Group Owner: meta-ti+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/leave/6695352/3617104/1311934448/xyzzy [denis@denix.org] > -=-=-=-=-=-=-=-=-=-=-=- >
Already done. No worries. On 5/11/2023 2:49 PM, Denys Dmytriyenko wrote: > Sorry about all that - I can resend everything specifically for kirkstone > > On Thu, May 11, 2023 at 02:46:11PM -0500, Ryan Eatmon via lists.yoctoproject.org wrote: >> >> This does not apply against kirkstone cleanly because of a patch >> applied to the master recipe that is not in kirkstone. I'll fix it >> as I apply the patch, but I wanted to inform anyone trying it >> themselves. >> >> >> On 5/11/2023 1:43 PM, Denys Dmytriyenko wrote: >>> From: Denys Dmytriyenko <denys@konsulko.com> >>> >>> Avoid inheriting ti-secdev class and adding unconditional dependency >>> on TI_SECURE_DEV_PKG and other variables, when meta-ti-bsp is in the >>> bblayers.conf stack, but not building for TI platforms. This solves >>> yocto-check-layer signature test for Yocto Project compliance. >>> >>> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> >>> --- >>> ...a_%.bbappend => trusted-firmware-a-ti.inc} | 0 >>> .../trusted-firmware-a_%.bbappend | 72 +------------------ >>> 2 files changed, 3 insertions(+), 69 deletions(-) >>> copy meta-ti-bsp/recipes-bsp/trusted-firmware-a/{trusted-firmware-a_%.bbappend => trusted-firmware-a-ti.inc} (100%) >>> >>> 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-ti.inc >>> similarity index 100% >>> copy from meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend >>> copy to meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc >>> 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 4ea63205..00d08a51 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 >>> @@ -1,70 +1,4 @@ >>> -PV:k3 = "2.8+git${SRCPV}" >>> -SRCREV_tfa:k3 = "2fcd408bb3a6756767a43c073c597cef06e7f2d5" >>> -SRC_URI:k3 = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master" >>> -COMPATIBLE_MACHINE:k3 = "k3" >>> -TFA_BUILD_TARGET:k3 = "all" >>> -TFA_INSTALL_TARGET:k3 = "bl31" >>> -TFA_SPD:k3 = "opteed" >>> +TFA_TI = "" >>> +TFA_TI:k3 = "trusted-firmware-a-ti.inc" >>> -SRC_URI:append:k3 = " file://rwx-segments-ti.patch" >>> -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" >>> - >>> -# 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() { >>> - 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 >>> -} >>> - >>> -do_compile:append:am65xx-hs-evm() { >>> - tfa_sign_k3hs >>> -} >>> - >>> -do_compile:append:am64xx-evm() { >>> - tfa_sign_k3hs >>> -} >>> - >>> -do_compile:append:am62xx-evm() { >>> - tfa_sign_k3hs >>> -} >>> - >>> -do_compile:append:am62xx-lp-evm() { >>> - tfa_sign_k3hs >>> -} >>> - >>> -do_compile:append:am62axx-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 >>> -} >>> - >>> -do_compile:append:j784s4-hs-evm() { >>> - tfa_sign_k3hs >>> -} >>> - >>> -do_install:append:k3() { >>> - if [ -f ${BUILD_DIR}/bl31.bin.unsigned ]; then >>> - echo "Install bl31.bin.unsigned" >>> - install -m 0644 ${BUILD_DIR}/bl31.bin.unsigned \ >>> - ${D}/firmware/bl31.bin.unsigned >>> - else >>> - echo "Install bl31.bin.unsigned" >>> - install -m 0644 ${BUILD_DIR}/bl31.bin \ >>> - ${D}/firmware/bl31.bin.unsigned >>> - fi >>> -} >>> +require ${TFA_TI} >>> >>> >>> >>> >>> >> >> -- >> Ryan Eatmon reatmon@ti.com >> ----------------------------------------- >> Texas Instruments, Inc. - LCPD - MGTS > >> >> -=-=-=-=-=-=-=-=-=-=-=- >> Links: You receive all messages sent to this group. >> View/Reply Online (#16521): https://lists.yoctoproject.org/g/meta-ti/message/16521 >> Mute This Topic: https://lists.yoctoproject.org/mt/98834090/3617104 >> Group Owner: meta-ti+owner@lists.yoctoproject.org >> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/leave/6695352/3617104/1311934448/xyzzy [denis@denix.org] >> -=-=-=-=-=-=-=-=-=-=-=- >> > >
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-ti.inc similarity index 100% copy from meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend copy to meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc 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 4ea63205..00d08a51 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 @@ -1,70 +1,4 @@ -PV:k3 = "2.8+git${SRCPV}" -SRCREV_tfa:k3 = "2fcd408bb3a6756767a43c073c597cef06e7f2d5" -SRC_URI:k3 = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master" -COMPATIBLE_MACHINE:k3 = "k3" -TFA_BUILD_TARGET:k3 = "all" -TFA_INSTALL_TARGET:k3 = "bl31" -TFA_SPD:k3 = "opteed" +TFA_TI = "" +TFA_TI:k3 = "trusted-firmware-a-ti.inc" -SRC_URI:append:k3 = " file://rwx-segments-ti.patch" -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" - -# 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() { - 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 -} - -do_compile:append:am65xx-hs-evm() { - tfa_sign_k3hs -} - -do_compile:append:am64xx-evm() { - tfa_sign_k3hs -} - -do_compile:append:am62xx-evm() { - tfa_sign_k3hs -} - -do_compile:append:am62xx-lp-evm() { - tfa_sign_k3hs -} - -do_compile:append:am62axx-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 -} - -do_compile:append:j784s4-hs-evm() { - tfa_sign_k3hs -} - -do_install:append:k3() { - if [ -f ${BUILD_DIR}/bl31.bin.unsigned ]; then - echo "Install bl31.bin.unsigned" - install -m 0644 ${BUILD_DIR}/bl31.bin.unsigned \ - ${D}/firmware/bl31.bin.unsigned - else - echo "Install bl31.bin.unsigned" - install -m 0644 ${BUILD_DIR}/bl31.bin \ - ${D}/firmware/bl31.bin.unsigned - fi -} +require ${TFA_TI}