Re: [meta-ti][master][RFC] optee: Rework include files
I like the -overrides naming. Not so sure about -srcrev one. Maybe -ver or -version? On Thu, Nov 02, 2023 at 01:20:46PM -0500, Ryan Eatmon via lists.yoctoproject.org wrote: > Minor rework of the TI include files used to override both SRCREV and > other settings in the optee recipes for TI SOC parts. The intent is to > make it more clear when we are changing SRCREVs versus changing other > items, and allow for sharing the SRCREV changes for optee-os-tadevkit > which should track the optee-os SRCREV. > > Signed-off-by: Ryan Eatmon > --- > ...optee-client-ti.inc => optee-client-ti-srcrev.inc} | 0 > .../recipes-security/optee/optee-client_%.bbappend| 6 +++--- > ...e-examples-ti.inc => optee-examples-ti-srcrev.inc} | 0 > .../recipes-security/optee/optee-examples_%.bbappend | 6 +++--- > .../optee/optee-os-tadevkit-ti-overrides.inc | 1 + > .../optee/optee-os-tadevkit_%.bbappend| 11 --- > .../{optee-os-ti.inc => optee-os-ti-overrides.inc}| 8 > ...ptee-os-tadevkit-ti.inc => optee-os-ti-srcrev.inc} | 2 -- > .../recipes-security/optee/optee-os_%.bbappend| 11 --- > .../{optee-test-ti.inc => optee-test-ti-srcrev.inc} | 0 > .../recipes-security/optee/optee-test_%.bbappend | 6 +++--- > 11 files changed, 26 insertions(+), 25 deletions(-) > rename meta-ti-bsp/recipes-security/optee/{optee-client-ti.inc => > optee-client-ti-srcrev.inc} (100%) > rename meta-ti-bsp/recipes-security/optee/{optee-examples-ti.inc => > optee-examples-ti-srcrev.inc} (100%) > create mode 100644 > meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti-overrides.inc > rename meta-ti-bsp/recipes-security/optee/{optee-os-ti.inc => > optee-os-ti-overrides.inc} (86%) > rename meta-ti-bsp/recipes-security/optee/{optee-os-tadevkit-ti.inc => > optee-os-ti-srcrev.inc} (87%) > rename meta-ti-bsp/recipes-security/optee/{optee-test-ti.inc => > optee-test-ti-srcrev.inc} (100%) > > diff --git a/meta-ti-bsp/recipes-security/optee/optee-client-ti.inc > b/meta-ti-bsp/recipes-security/optee/optee-client-ti-srcrev.inc > similarity index 100% > rename from meta-ti-bsp/recipes-security/optee/optee-client-ti.inc > rename to meta-ti-bsp/recipes-security/optee/optee-client-ti-srcrev.inc > diff --git a/meta-ti-bsp/recipes-security/optee/optee-client_%.bbappend > b/meta-ti-bsp/recipes-security/optee/optee-client_%.bbappend > index 08c5256b..71b85720 100644 > --- a/meta-ti-bsp/recipes-security/optee/optee-client_%.bbappend > +++ b/meta-ti-bsp/recipes-security/optee/optee-client_%.bbappend > @@ -1,4 +1,4 @@ > -OPTEE_TI = "" > -OPTEE_TI:ti-soc = "${BPN}-ti.inc" > +OPTEE_TI_SRCREV = "" > +OPTEE_TI_SRCREV:ti-soc = "${BPN}-ti-srcrev.inc" > > -require ${OPTEE_TI} > +require ${OPTEE_TI_SRCREV} > diff --git a/meta-ti-bsp/recipes-security/optee/optee-examples-ti.inc > b/meta-ti-bsp/recipes-security/optee/optee-examples-ti-srcrev.inc > similarity index 100% > rename from meta-ti-bsp/recipes-security/optee/optee-examples-ti.inc > rename to meta-ti-bsp/recipes-security/optee/optee-examples-ti-srcrev.inc > diff --git a/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend > b/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend > index 08c5256b..71b85720 100644 > --- a/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend > +++ b/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend > @@ -1,4 +1,4 @@ > -OPTEE_TI = "" > -OPTEE_TI:ti-soc = "${BPN}-ti.inc" > +OPTEE_TI_SRCREV = "" > +OPTEE_TI_SRCREV:ti-soc = "${BPN}-ti-srcrev.inc" > > -require ${OPTEE_TI} > +require ${OPTEE_TI_SRCREV} > diff --git > a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti-overrides.inc > b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti-overrides.inc > new file mode 100644 > index ..df46e243 > --- /dev/null > +++ b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti-overrides.inc > @@ -0,0 +1 @@ > +EXTRA_OEMAKE:remove = "CFG_MAP_EXT_DT_SECURE=y" > diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend > b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend > index 08c5256b..9f265932 100644 > --- a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend > +++ b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend > @@ -1,4 +1,9 @@ > -OPTEE_TI = "" > -OPTEE_TI:ti-soc = "${BPN}-ti.inc" > +OPTEE_TI_SRCREV = "" > +OPTEE_TI_SRCREV:ti-soc = "optee-os-ti-srcrev.inc" > > -require ${OPTEE_TI} > +require ${OPTEE_TI_SRCREV} > + > +OPTEE_TI_OVERRIDES = "" > +OPTEE_TI_OVERRIDES:ti-soc = "${BPN}-ti-overrides.inc" > + > +require ${OPTEE_TI_OVERRIDES} > diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-ti.inc > b/meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc > similarity index 86% > rename from meta-ti-bsp/recipes-security/optee/optee-os-ti.inc > rename to meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc > index 6d192bbe..de13d282 100644 > --- a/meta-ti-bsp/recipe
Re: [meta-ti][master/kirkstone][PATCH 8/8] recipes-bsp: Do not use MACHINE_ARCH when package is not machine specific
On Thu, Nov 02, 2023 at 09:57:11AM -0500, Ryan Eatmon wrote: > > > On 10/26/2023 9:00 AM, Andrew Davis wrote: > >On 10/25/23 10:27 PM, Denys Dmytriyenko wrote: > >>On Wed, Oct 25, 2023 at 11:56:30AM -0500, Andrew Davis via > >>lists.yoctoproject.org wrote: > >>>Signed-off-by: Andrew Davis > >>>--- > >>> meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb | 2 -- > >>> meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb | 2 -- > >>> meta-ti-bsp/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb | 1 - > >>> meta-ti-bsp/recipes-bsp/goodix-fw/goodix-fw_git.bb | 2 -- > >>> meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb | 2 -- > >>> meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x_git.bb | 2 -- > >>> meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw-am65x-sr2_git.bb | 2 -- > >>> meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw-am65x-sr2_git.bb | 2 -- > >>> meta-ti-bsp/recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb | 2 -- > >>> meta-ti-bsp/recipes-bsp/vis-fw/vis_01.50.07.15.bb | 1 - > >>> meta-ti-bsp/recipes-bsp/vpdma-fw/vpdma-fw_03-2012.bb | 1 - > >>> 11 files changed, 19 deletions(-) > >> > >>Overall I agree and fully support the first 7 patches in this series. > >> > >>But for this last one I wanted to open a discussion. > >> > > > >I try to sort my series in least-to-most likely to be controversial, I was > >just wondering how far we would get down the list, glad we got to 8 :) > > > >>On one hand I understand the desire to make components as > >>generic as possible > >>and reduce the number of machine-specific components to a bare minimum. > >> > >>But on another hand, marking the resulting package as > >>machine-specific when it > >>has a short list of compatible machines is a standard practice. > >>The reason is > >>that the list of compatible machines controls only compile time > >>filtering, but > >>doesn't have any effect on run time. And marking packages as > >>machine specific > >>helps with that. That closes the loophole of installing > >>incompatible packages. > >> > >>For example, first recipe below specifies that Cadence MHDP firmware is > >>compatible with 3 J7 platforms only (or their SoC families, to be exact). > >>But w/o marking resulting binary package as machine-specific (therefore > >>producing separate packages for those platforms), there will be a single > >>generic Aarch64 package made. And there's no protection from installing > >>this generic package on non-compatible platforms, like J7200 or AM65xx, > >>either manullay or by pulling it into a rootfs for those incompatible > >>platforms. > >> > >>And you normally want to prevent this for regular components. But I guess > >>this doesn't fully apply to FW images that are loaded by corresponding > >>drivers anyway. Moreover, there's no compilation involved, just packaging > >>the binary blob. > >> > >>In that case, should we also remove COMPATIBLE_MACHINE from > >>these firmware > >>recipes? > >> > > > >That is exactly where I was going to go next. These firmware packages are > >not technically incompatible with the other machines. > > > >We just use COMPATIBLE_MACHINE checks here to keep us from > >accidentily bundling > >them with images where they wouldn't add any value (which you did > >with prusw-fw > >which is what stated me thinking on all this). But since they don't break > >anything either, forcing them to be machine specific seemed like > >overkill also. > > > >Only place where we still need this is firmware recipes that only > >ship some of > >the firmware based on machine (see prueth-fw for instance). I'd like to get > >that cleaned up next. If we only want some of the firmware then we > >should split > >it into different packages (prueth-fw-am57xx, etc.) and only > >install the one > >we want for that platform. > > Denys, does Andrew's response address your concerns? Well, I do believe we are generally in agreement here. But I'm not sure if that means we should merge patch #8 as is and address COMPATIBLE_MACHINE changes later, or rework the patch to address that with MACHINE_ARCH together? -- Denys -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#17232): https://lists.yoctoproject.org/g/meta-ti/message/17232 Mute This Topic: https://lists.yoctoproject.org/mt/102182712/21656 Group Owner: meta-ti+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/leave/6695321/21656/1393940836/xyzzy [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[meta-ti][kirkstone][PATCH 4/4] linux-ti-staging_6.1: CI/CD Auto-Merger: cicd.kirkstone.202311022105
Updated the value(s) for: SRCREV Signed-off-by: LCPD Automation Script --- meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb index 55407cb..d8e44d7 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb @@ -23,7 +23,7 @@ S = "${WORKDIR}/git" BRANCH ?= "ti-linux-6.1.y" -SRCREV ?= "37f154cc9c52ff63ffbe8b44d295a1fc708b" +SRCREV ?= "7d494fe58c8e5d41a6bd886c9a628a7fff5763f9" PV = "6.1.46+git${SRCPV}" # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild -- 1.8.3.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#17230): https://lists.yoctoproject.org/g/meta-ti/message/17230 Mute This Topic: https://lists.yoctoproject.org/mt/102358646/21656 Group Owner: meta-ti+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[meta-ti][kirkstone][PATCH 3/4] linux-ti-staging-rt_6.1: CI/CD Auto-Merger: cicd.kirkstone.202311022105
Updated the value(s) for: SRCREV Signed-off-by: LCPD Automation Script --- meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb index 55033b4..a600630 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb @@ -6,5 +6,5 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:" BRANCH = "ti-rt-linux-6.1.y" -SRCREV = "24fe2a78c3ecd5b2232aa9381c5d152e06acd409" +SRCREV = "eda9974e8513cdd2c5cc20c3c6b851f9977acd4d" PV = "6.1.46+git${SRCPV}" -- 1.8.3.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#17231): https://lists.yoctoproject.org/g/meta-ti/message/17231 Mute This Topic: https://lists.yoctoproject.org/mt/102358647/21656 Group Owner: meta-ti+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[meta-ti][kirkstone][PATCH 2/4] u-boot-ti-staging_2023.04: CI/CD Auto-Merger: cicd.kirkstone.202311022105
Updated the value(s) for: SRCREV Signed-off-by: LCPD Automation Script --- meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb index 4413d26..0bba349 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb @@ -6,7 +6,7 @@ PR = "r0" BRANCH = "ti-u-boot-2023.04" -SRCREV = "4c358e47858a340d69ce92547ece48d8cc93b99b" +SRCREV = "b0d868ee086eb5c96a3d32f72a7cb9670abf5b90" do_install:append:am62xx() { install -d ${D}/boot -- 1.8.3.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#17229): https://lists.yoctoproject.org/g/meta-ti/message/17229 Mute This Topic: https://lists.yoctoproject.org/mt/102358645/21656 Group Owner: meta-ti+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[meta-ti][kirkstone][PATCH 1/4] ti-linux-fw: CI/CD Auto-Merger: cicd.kirkstone.202311022105
Updated the value(s) for: TI_LINUX_FW_SRCREV Signed-off-by: LCPD Automation Script --- meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc index 149fcc0..b67cdc8 100644 --- a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc +++ b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc @@ -17,7 +17,7 @@ CNM_WAVE521_FW_VERSION = "1.0.00" TI_DM_FW_VERSION = "08.06.04" TI_SYSFW_VERSION = "08.06.04" -TI_LINUX_FW_SRCREV ?= "1c28bc84f3e82a29e27ac400aaf880062559575c" +TI_LINUX_FW_SRCREV ?= "fc8e9ddf23ba6cf071c1c225e78c2bd8733d7780" SRCREV = "${TI_LINUX_FW_SRCREV}" BRANCH ?= "ti-linux-firmware" -- 1.8.3.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#17228): https://lists.yoctoproject.org/g/meta-ti/message/17228 Mute This Topic: https://lists.yoctoproject.org/mt/102358644/21656 Group Owner: meta-ti+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[meta-ti][kirkstone][PATCH 0/4] Update to cicd.kirkstone.202311022105
Update linux-ti-staging_6.1, linux-ti-staging-rt_6.1, ti-linux-fw and u-boot-ti-staging_2023.04 to cicd.kirkstone.202311022105 tag LCPD Automation Script (4): ti-linux-fw: CI/CD Auto-Merger: cicd.kirkstone.202311022105 u-boot-ti-staging_2023.04: CI/CD Auto-Merger: cicd.kirkstone.202311022105 linux-ti-staging-rt_6.1: CI/CD Auto-Merger: cicd.kirkstone.202311022105 linux-ti-staging_6.1: CI/CD Auto-Merger: cicd.kirkstone.202311022105 meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 2 +- meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb | 2 +- meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb | 2 +- meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb| 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -- 1.8.3.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#17227): https://lists.yoctoproject.org/g/meta-ti/message/17227 Mute This Topic: https://lists.yoctoproject.org/mt/102358643/21656 Group Owner: meta-ti+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [meta-ti] [kirkstone][PATCH] k3r5: Use the ?= default assignment to allow for overrides
On Thu, Nov 02, 2023 at 11:48:28AM +0100, Massimiliano Minella wrote: > From: Ryan Eatmon > > Move to setting the values for PREFERRED_PROVIDER using the > ?= default assignment so that we can override the setting if > we would like to. > > Signed-off-by: Ryan Eatmon > Signed-off-by: Massimiliano Minella > --- > meta-ti-bsp/conf/machine/include/k3r5.inc | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/meta-ti-bsp/conf/machine/include/k3r5.inc > b/meta-ti-bsp/conf/machine/include/k3r5.inc > index c5c03cbf..184d3a09 100644 > --- a/meta-ti-bsp/conf/machine/include/k3r5.inc > +++ b/meta-ti-bsp/conf/machine/include/k3r5.inc > @@ -11,9 +11,9 @@ require conf/machine/include/arm/armv7a/tune-cortexa8.inc > # https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/j721e_evm.rst > # https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/am62x_sk.rst > # https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/k3.rst > -PREFERRED_PROVIDER_virtual/kernel = "linux-dummy" > -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" > -PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" > +PREFERRED_PROVIDER_virtual/kernel ?= "linux-dummy" > +PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" > +PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" Being able to override u-boot for k3r5 makes sense. But allowing to change the kernel for k3r5 multiconfig that is now marked as baremetal is rather dubious... What kind of use-case requires it? > SPL_SUFFIX = "bin" > SPL_BINARY = > "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.${SPL_SUFFIX}" > -- > 2.42.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#17226): https://lists.yoctoproject.org/g/meta-ti/message/17226 Mute This Topic: https://lists.yoctoproject.org/mt/102339031/21656 Group Owner: meta-ti+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/leave/6695321/21656/1393940836/xyzzy [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[meta-ti][master][RFC] optee: Rework include files
Minor rework of the TI include files used to override both SRCREV and other settings in the optee recipes for TI SOC parts. The intent is to make it more clear when we are changing SRCREVs versus changing other items, and allow for sharing the SRCREV changes for optee-os-tadevkit which should track the optee-os SRCREV. Signed-off-by: Ryan Eatmon --- ...optee-client-ti.inc => optee-client-ti-srcrev.inc} | 0 .../recipes-security/optee/optee-client_%.bbappend| 6 +++--- ...e-examples-ti.inc => optee-examples-ti-srcrev.inc} | 0 .../recipes-security/optee/optee-examples_%.bbappend | 6 +++--- .../optee/optee-os-tadevkit-ti-overrides.inc | 1 + .../optee/optee-os-tadevkit_%.bbappend| 11 --- .../{optee-os-ti.inc => optee-os-ti-overrides.inc}| 8 ...ptee-os-tadevkit-ti.inc => optee-os-ti-srcrev.inc} | 2 -- .../recipes-security/optee/optee-os_%.bbappend| 11 --- .../{optee-test-ti.inc => optee-test-ti-srcrev.inc} | 0 .../recipes-security/optee/optee-test_%.bbappend | 6 +++--- 11 files changed, 26 insertions(+), 25 deletions(-) rename meta-ti-bsp/recipes-security/optee/{optee-client-ti.inc => optee-client-ti-srcrev.inc} (100%) rename meta-ti-bsp/recipes-security/optee/{optee-examples-ti.inc => optee-examples-ti-srcrev.inc} (100%) create mode 100644 meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti-overrides.inc rename meta-ti-bsp/recipes-security/optee/{optee-os-ti.inc => optee-os-ti-overrides.inc} (86%) rename meta-ti-bsp/recipes-security/optee/{optee-os-tadevkit-ti.inc => optee-os-ti-srcrev.inc} (87%) rename meta-ti-bsp/recipes-security/optee/{optee-test-ti.inc => optee-test-ti-srcrev.inc} (100%) diff --git a/meta-ti-bsp/recipes-security/optee/optee-client-ti.inc b/meta-ti-bsp/recipes-security/optee/optee-client-ti-srcrev.inc similarity index 100% rename from meta-ti-bsp/recipes-security/optee/optee-client-ti.inc rename to meta-ti-bsp/recipes-security/optee/optee-client-ti-srcrev.inc diff --git a/meta-ti-bsp/recipes-security/optee/optee-client_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-client_%.bbappend index 08c5256b..71b85720 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-client_%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-client_%.bbappend @@ -1,4 +1,4 @@ -OPTEE_TI = "" -OPTEE_TI:ti-soc = "${BPN}-ti.inc" +OPTEE_TI_SRCREV = "" +OPTEE_TI_SRCREV:ti-soc = "${BPN}-ti-srcrev.inc" -require ${OPTEE_TI} +require ${OPTEE_TI_SRCREV} diff --git a/meta-ti-bsp/recipes-security/optee/optee-examples-ti.inc b/meta-ti-bsp/recipes-security/optee/optee-examples-ti-srcrev.inc similarity index 100% rename from meta-ti-bsp/recipes-security/optee/optee-examples-ti.inc rename to meta-ti-bsp/recipes-security/optee/optee-examples-ti-srcrev.inc diff --git a/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend index 08c5256b..71b85720 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend @@ -1,4 +1,4 @@ -OPTEE_TI = "" -OPTEE_TI:ti-soc = "${BPN}-ti.inc" +OPTEE_TI_SRCREV = "" +OPTEE_TI_SRCREV:ti-soc = "${BPN}-ti-srcrev.inc" -require ${OPTEE_TI} +require ${OPTEE_TI_SRCREV} diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti-overrides.inc b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti-overrides.inc new file mode 100644 index ..df46e243 --- /dev/null +++ b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti-overrides.inc @@ -0,0 +1 @@ +EXTRA_OEMAKE:remove = "CFG_MAP_EXT_DT_SECURE=y" diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend index 08c5256b..9f265932 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend @@ -1,4 +1,9 @@ -OPTEE_TI = "" -OPTEE_TI:ti-soc = "${BPN}-ti.inc" +OPTEE_TI_SRCREV = "" +OPTEE_TI_SRCREV:ti-soc = "optee-os-ti-srcrev.inc" -require ${OPTEE_TI} +require ${OPTEE_TI_SRCREV} + +OPTEE_TI_OVERRIDES = "" +OPTEE_TI_OVERRIDES:ti-soc = "${BPN}-ti-overrides.inc" + +require ${OPTEE_TI_OVERRIDES} diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-ti.inc b/meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc similarity index 86% rename from meta-ti-bsp/recipes-security/optee/optee-os-ti.inc rename to meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc index 6d192bbe..de13d282 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os-ti.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc @@ -1,11 +1,3 @@ -PV = "4.0.0+git${SRCPV}" -SRCREV = "2a5b1d1232f582056184367fb58a425ac7478ec6" - -# Fixes for pointing to 4.0.0 before upstream meta-arm -FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os-4.0.0:" -SRC_URI:remove = "file://0002-core-Define-section-attributes-for-clang.
[meta-ti][master][PATCH] optee-client: Remove upstreamed options
Remove the pkgconfig settings since they are upstreamed. Signed-off-by: Ryan Eatmon --- meta-ti-bsp/recipes-security/optee/optee-client-ti.inc | 5 - 1 file changed, 5 deletions(-) diff --git a/meta-ti-bsp/recipes-security/optee/optee-client-ti.inc b/meta-ti-bsp/recipes-security/optee/optee-client-ti.inc index f64a90c3..0da37acf 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-client-ti.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-client-ti.inc @@ -1,7 +1,2 @@ PV = "4.0.0+git${SRCPV}" SRCREV = "acb0885c117e73cb6c5c9b1dd9054cb3f93507ee" - -inherit pkgconfig -DEPENDS += "util-linux" - -EXTRA_OEMAKE += "PKG_CONFIG=pkg-config" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#17224): https://lists.yoctoproject.org/g/meta-ti/message/17224 Mute This Topic: https://lists.yoctoproject.org/mt/102348938/21656 Group Owner: meta-ti+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/leave/6695321/21656/1393940836/xyzzy [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [meta-ti][master/kirkstone][PATCH 8/8] recipes-bsp: Do not use MACHINE_ARCH when package is not machine specific
On 10/26/2023 9:00 AM, Andrew Davis wrote: On 10/25/23 10:27 PM, Denys Dmytriyenko wrote: On Wed, Oct 25, 2023 at 11:56:30AM -0500, Andrew Davis via lists.yoctoproject.org wrote: Signed-off-by: Andrew Davis --- meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb | 2 -- meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb | 2 -- meta-ti-bsp/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb | 1 - meta-ti-bsp/recipes-bsp/goodix-fw/goodix-fw_git.bb | 2 -- meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb | 2 -- meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x_git.bb | 2 -- meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw-am65x-sr2_git.bb | 2 -- meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw-am65x-sr2_git.bb | 2 -- meta-ti-bsp/recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb | 2 -- meta-ti-bsp/recipes-bsp/vis-fw/vis_01.50.07.15.bb | 1 - meta-ti-bsp/recipes-bsp/vpdma-fw/vpdma-fw_03-2012.bb | 1 - 11 files changed, 19 deletions(-) Overall I agree and fully support the first 7 patches in this series. But for this last one I wanted to open a discussion. I try to sort my series in least-to-most likely to be controversial, I was just wondering how far we would get down the list, glad we got to 8 :) On one hand I understand the desire to make components as generic as possible and reduce the number of machine-specific components to a bare minimum. But on another hand, marking the resulting package as machine-specific when it has a short list of compatible machines is a standard practice. The reason is that the list of compatible machines controls only compile time filtering, but doesn't have any effect on run time. And marking packages as machine specific helps with that. That closes the loophole of installing incompatible packages. For example, first recipe below specifies that Cadence MHDP firmware is compatible with 3 J7 platforms only (or their SoC families, to be exact). But w/o marking resulting binary package as machine-specific (therefore producing separate packages for those platforms), there will be a single generic Aarch64 package made. And there's no protection from installing this generic package on non-compatible platforms, like J7200 or AM65xx, either manullay or by pulling it into a rootfs for those incompatible platforms. And you normally want to prevent this for regular components. But I guess this doesn't fully apply to FW images that are loaded by corresponding drivers anyway. Moreover, there's no compilation involved, just packaging the binary blob. In that case, should we also remove COMPATIBLE_MACHINE from these firmware recipes? That is exactly where I was going to go next. These firmware packages are not technically incompatible with the other machines. We just use COMPATIBLE_MACHINE checks here to keep us from accidentily bundling them with images where they wouldn't add any value (which you did with prusw-fw which is what stated me thinking on all this). But since they don't break anything either, forcing them to be machine specific seemed like overkill also. Only place where we still need this is firmware recipes that only ship some of the firmware based on machine (see prueth-fw for instance). I'd like to get that cleaned up next. If we only want some of the firmware then we should split it into different packages (prueth-fw-am57xx, etc.) and only install the one we want for that platform. Andrew Denys, does Andrew's response address your concerns? diff --git a/meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb b/meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb index d88bca6e..ed1c7817 100644 --- a/meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb @@ -10,8 +10,6 @@ PR = "${INC_PR}.0" COMPATIBLE_MACHINE = "j721e|j721s2|j784s4" -PACKAGE_ARCH = "${MACHINE_ARCH}" - TARGET = "mhdp8546.bin" do_install() { diff --git a/meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb b/meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb index 5b1d8be1..ef7bc2ad 100644 --- a/meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb @@ -12,8 +12,6 @@ PR = "${INC_PR}.1" COMPATIBLE_MACHINE = "j721s2|j784s4|am62axx" -PACKAGE_ARCH = "${MACHINE_ARCH}" - TARGET_WAVE521C = "wave521c_codec_fw.bin" SOURCE_WAVE521C = "wave521c_k3_codec_fw.bin" diff --git a/meta-ti-bsp/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb b/meta-ti-bsp/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb index 6e2996ce..e333d212 100755 --- a/meta-ti-bsp/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb @@ -4,7 +4,6 @@ LICENSE = "TI-TFL" LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=04ad0a015d4bb63c2b9e7b112debf3db" PV = "6.2+git${SRCPV}" -PACKAGE_ARCH =
Re: [meta-ti] [kirkstone][PATCH] k3r5: Use the ?= default assignment to allow for overrides
On 02/11/23 16:18, Massimiliano Minella wrote: From: Ryan Eatmon Move to setting the values for PREFERRED_PROVIDER using the ?= default assignment so that we can override the setting if we would like to. Signed-off-by: Ryan Eatmon Signed-off-by: Massimiliano Minella Acked-by: Chirag Shilwant --- meta-ti-bsp/conf/machine/include/k3r5.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-ti-bsp/conf/machine/include/k3r5.inc b/meta-ti-bsp/conf/machine/include/k3r5.inc index c5c03cbf..184d3a09 100644 --- a/meta-ti-bsp/conf/machine/include/k3r5.inc +++ b/meta-ti-bsp/conf/machine/include/k3r5.inc @@ -11,9 +11,9 @@ require conf/machine/include/arm/armv7a/tune-cortexa8.inc # https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/j721e_evm.rst # https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/am62x_sk.rst # https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/k3.rst -PREFERRED_PROVIDER_virtual/kernel = "linux-dummy" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" -PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-dummy" +PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" +PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" SPL_SUFFIX = "bin" SPL_BINARY = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.${SPL_SUFFIX}" -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#17222): https://lists.yoctoproject.org/g/meta-ti/message/17222 Mute This Topic: https://lists.yoctoproject.org/mt/102339031/21656 Group Owner: meta-ti+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[meta-ti] [kirkstone][PATCH] k3r5: Use the ?= default assignment to allow for overrides
From: Ryan Eatmon Move to setting the values for PREFERRED_PROVIDER using the ?= default assignment so that we can override the setting if we would like to. Signed-off-by: Ryan Eatmon Signed-off-by: Massimiliano Minella --- meta-ti-bsp/conf/machine/include/k3r5.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-ti-bsp/conf/machine/include/k3r5.inc b/meta-ti-bsp/conf/machine/include/k3r5.inc index c5c03cbf..184d3a09 100644 --- a/meta-ti-bsp/conf/machine/include/k3r5.inc +++ b/meta-ti-bsp/conf/machine/include/k3r5.inc @@ -11,9 +11,9 @@ require conf/machine/include/arm/armv7a/tune-cortexa8.inc # https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/j721e_evm.rst # https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/am62x_sk.rst # https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/k3.rst -PREFERRED_PROVIDER_virtual/kernel = "linux-dummy" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" -PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-dummy" +PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" +PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" SPL_SUFFIX = "bin" SPL_BINARY = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.${SPL_SUFFIX}" -- 2.42.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#17221): https://lists.yoctoproject.org/g/meta-ti/message/17221 Mute This Topic: https://lists.yoctoproject.org/mt/102339031/21656 Group Owner: meta-ti+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-