| Message ID | 20221006150628.17044-7-afd@ti.com |
|---|---|
| State | Superseded, archived |
| Delegated to: | Denys Dmytriyenko |
| Headers | show |
| Series | [meta-arago,master/kirkstone,1/7] ti-crypto-examples: Remove ti-crypto-examples | expand |
On Thu, Oct 06, 2022 at 10:06:28AM -0500, Andrew Davis via lists.yoctoproject.org wrote: > Now that we have SoC names, we can avoid adding features based on the > board name. We expect folks to create their own boards based on these > SoCs, and so using the TI made EVM board name everywhere adds extra churn > when adding a new board. Plus it is more correct for most of these > features as they depend on the SoC, not on the EVM board. > > One other thing we do here is to not use the generic "j7" name, > the current and future J7 devices are far to feature diverse > to group at this level. Grouping like that will lead to the wrong > things getting enabled as new J7 SoCs are added. Hmm, this second part is rather backwards (IMO) in some places, see below. > diff --git a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc > index 3c31ba18..296eef7a 100644 > --- a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc > +++ b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc > @@ -24,7 +24,9 @@ DTB_FILTER:am57xx-hs-evm = "${DTB_FILTER:am57xx-evm}" > DTB_FILTER:ti43x = "am43" > DTB_FILTER:omapl138 = "da850" > DTB_FILTER:am65xx = "am65" > -DTB_FILTER:j7 = "j721e" > +DTB_FILTER:j721e = "j721e" > +DTB_FILTER:j7200 = "j7200" > +DTB_FILTER:j721s2 = "j721s2" Yes, here it does make perfect sense. > diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb > index f4e72a89..c01e9497 100644 > --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb > +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb > @@ -61,9 +61,9 @@ UTILS:append:am64xx = " ti-rtos-firmware pru-icss" > UTILS:append:am62xx = " ti-rtos-firmware" > #UTILS:append:am65xx = " ti-rtos-firmware pru-icss pru-pwm-fw" > UTILS:append:am65xx = " ti-rtos-firmware pru-icss" > -UTILS:append:j7 = " ti-rtos-firmware" > -UTILS:append:j721e-evm = " pru-icss" > -UTILS:append:j721e-hs-evm = " pru-icss" > +UTILS:append:j721e = " ti-rtos-firmware pru-icss" > +UTILS:append:j7200 = " ti-rtos-firmware" > +UTILS:append:j721s2 = " ti-rtos-firmware" Here - not so much. ti-rtos-firmware is applicable to all j7. So, I'd leave that line alone and only replace adding pru-icss to specific EVMs to adding it to j721e SoC family. Or go even further - ti-rtos-firmware is common to all k3 platforms, so all the individual am65xx, am64xx and am62xx, along with j7, could be replaced with one line: UTILS:append:k3 = " ti-rtos-firmware" And then add pri-icss or other extra FW to specific SoC families only. > diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb b/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb > index e16e4d51..e6e0b915 100644 > --- a/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb > +++ b/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb > @@ -19,7 +19,9 @@ ANALYTICS = "" > # ${@['','qt-opencv-opencl-opengl-multithreaded'][oe.utils.all_distro_features(d, 'opencv opencl opengl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'gpu dsp', True, False, d)]} \ > # ${@['','barcode-roi'][oe.utils.all_distro_features(d, 'opencv', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \ > #" > -ANALYTICS:j7 = "" > +ANALYTICS:j721e = "" > +ANALYTICS:j7200 = "" > +ANALYTICS:j721s2 = "" Well, this is probably completely wrong by now, anyway. > ANALYTICS:omapl138 = "" > > RDEPENDS:${PN} = "\ > diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-test.bb b/meta-arago-distro/recipes-core/packagegroups/ti-test.bb > index 99a6cc82..5f56f8be 100644 > --- a/meta-arago-distro/recipes-core/packagegroups/ti-test.bb > +++ b/meta-arago-distro/recipes-core/packagegroups/ti-test.bb > @@ -78,7 +78,15 @@ ARAGO_TI_TEST:append:k3 = " \ > k3conf \ > " > > -ARAGO_TI_TEST:append:j7 = " \ > +ARAGO_TI_TEST:append:j721e = " \ > + ufs-utils \ > +" > + > +ARAGO_TI_TEST:append:j7200 = " \ > + ufs-utils \ > +" > + > +ARAGO_TI_TEST:append:j721s2 = " \ > ufs-utils \ > " ufs-utils is quite generic and should probably be added to k3 or maybe even all platforms...
On 10/7/22 3:10 PM, Denys Dmytriyenko wrote: > On Thu, Oct 06, 2022 at 10:06:28AM -0500, Andrew Davis via lists.yoctoproject.org wrote: >> Now that we have SoC names, we can avoid adding features based on the >> board name. We expect folks to create their own boards based on these >> SoCs, and so using the TI made EVM board name everywhere adds extra churn >> when adding a new board. Plus it is more correct for most of these >> features as they depend on the SoC, not on the EVM board. >> >> One other thing we do here is to not use the generic "j7" name, >> the current and future J7 devices are far to feature diverse >> to group at this level. Grouping like that will lead to the wrong >> things getting enabled as new J7 SoCs are added. > > Hmm, this second part is rather backwards (IMO) in some places, see below. > > >> diff --git a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc >> index 3c31ba18..296eef7a 100644 >> --- a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc >> +++ b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc >> @@ -24,7 +24,9 @@ DTB_FILTER:am57xx-hs-evm = "${DTB_FILTER:am57xx-evm}" >> DTB_FILTER:ti43x = "am43" >> DTB_FILTER:omapl138 = "da850" >> DTB_FILTER:am65xx = "am65" >> -DTB_FILTER:j7 = "j721e" >> +DTB_FILTER:j721e = "j721e" >> +DTB_FILTER:j7200 = "j7200" >> +DTB_FILTER:j721s2 = "j721s2" > > Yes, here it does make perfect sense. > > >> diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb >> index f4e72a89..c01e9497 100644 >> --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb >> +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb >> @@ -61,9 +61,9 @@ UTILS:append:am64xx = " ti-rtos-firmware pru-icss" >> UTILS:append:am62xx = " ti-rtos-firmware" >> #UTILS:append:am65xx = " ti-rtos-firmware pru-icss pru-pwm-fw" >> UTILS:append:am65xx = " ti-rtos-firmware pru-icss" >> -UTILS:append:j7 = " ti-rtos-firmware" >> -UTILS:append:j721e-evm = " pru-icss" >> -UTILS:append:j721e-hs-evm = " pru-icss" >> +UTILS:append:j721e = " ti-rtos-firmware pru-icss" >> +UTILS:append:j7200 = " ti-rtos-firmware" >> +UTILS:append:j721s2 = " ti-rtos-firmware" > > Here - not so much. ti-rtos-firmware is applicable to all j7. So, I'd leave > that line alone and only replace adding pru-icss to specific EVMs to adding it > to j721e SoC family. > > Or go even further - ti-rtos-firmware is common to all k3 platforms, so all > the individual am65xx, am64xx and am62xx, along with j7, could be replaced > with one line: > > UTILS:append:k3 = " ti-rtos-firmware" > > And then add pri-icss or other extra FW to specific SoC families only. > If you want I can make this re-arrangement in a follow up patch. > >> diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb b/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb >> index e16e4d51..e6e0b915 100644 >> --- a/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb >> +++ b/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb >> @@ -19,7 +19,9 @@ ANALYTICS = "" >> # ${@['','qt-opencv-opencl-opengl-multithreaded'][oe.utils.all_distro_features(d, 'opencv opencl opengl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'gpu dsp', True, False, d)]} \ >> # ${@['','barcode-roi'][oe.utils.all_distro_features(d, 'opencv', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \ >> #" >> -ANALYTICS:j7 = "" >> +ANALYTICS:j721e = "" >> +ANALYTICS:j7200 = "" >> +ANALYTICS:j721s2 = "" > > Well, this is probably completely wrong by now, anyway. > Yes it probably is, but then my point in this patch was to not make any changes to functionality (or as few as possible). So if it is broken now, it was broken just the same before. > >> ANALYTICS:omapl138 = "" >> >> RDEPENDS:${PN} = "\ >> diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-test.bb b/meta-arago-distro/recipes-core/packagegroups/ti-test.bb >> index 99a6cc82..5f56f8be 100644 >> --- a/meta-arago-distro/recipes-core/packagegroups/ti-test.bb >> +++ b/meta-arago-distro/recipes-core/packagegroups/ti-test.bb >> @@ -78,7 +78,15 @@ ARAGO_TI_TEST:append:k3 = " \ >> k3conf \ >> " >> >> -ARAGO_TI_TEST:append:j7 = " \ >> +ARAGO_TI_TEST:append:j721e = " \ >> + ufs-utils \ >> +" >> + >> +ARAGO_TI_TEST:append:j7200 = " \ >> + ufs-utils \ >> +" >> + >> +ARAGO_TI_TEST:append:j721s2 = " \ >> ufs-utils \ >> " > > ufs-utils is quite generic and should probably be added to k3 or maybe even > all platforms... > Same as above, would you like this done in a follow up patch? This patch only fans out the name keeping the same functionality as before. If that exposes existing issues or opportunities for cleanup, then I can make those next. Andrew
On Mon, Oct 10, 2022 at 08:26:26AM -0500, Andrew Davis wrote: > On 10/7/22 3:10 PM, Denys Dmytriyenko wrote: > >On Thu, Oct 06, 2022 at 10:06:28AM -0500, Andrew Davis via lists.yoctoproject.org wrote: > >>Now that we have SoC names, we can avoid adding features based on the > >>board name. We expect folks to create their own boards based on these > >>SoCs, and so using the TI made EVM board name everywhere adds extra churn > >>when adding a new board. Plus it is more correct for most of these > >>features as they depend on the SoC, not on the EVM board. > >> > >>One other thing we do here is to not use the generic "j7" name, > >>the current and future J7 devices are far to feature diverse > >>to group at this level. Grouping like that will lead to the wrong > >>things getting enabled as new J7 SoCs are added. > > > >Hmm, this second part is rather backwards (IMO) in some places, see below. > > > > > >>diff --git a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc > >>index 3c31ba18..296eef7a 100644 > >>--- a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc > >>+++ b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc > >>@@ -24,7 +24,9 @@ DTB_FILTER:am57xx-hs-evm = "${DTB_FILTER:am57xx-evm}" > >> DTB_FILTER:ti43x = "am43" > >> DTB_FILTER:omapl138 = "da850" > >> DTB_FILTER:am65xx = "am65" > >>-DTB_FILTER:j7 = "j721e" > >>+DTB_FILTER:j721e = "j721e" > >>+DTB_FILTER:j7200 = "j7200" > >>+DTB_FILTER:j721s2 = "j721s2" > > > >Yes, here it does make perfect sense. > > > > > >>diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb > >>index f4e72a89..c01e9497 100644 > >>--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb > >>+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb > >>@@ -61,9 +61,9 @@ UTILS:append:am64xx = " ti-rtos-firmware pru-icss" > >> UTILS:append:am62xx = " ti-rtos-firmware" > >> #UTILS:append:am65xx = " ti-rtos-firmware pru-icss pru-pwm-fw" > >> UTILS:append:am65xx = " ti-rtos-firmware pru-icss" > >>-UTILS:append:j7 = " ti-rtos-firmware" > >>-UTILS:append:j721e-evm = " pru-icss" > >>-UTILS:append:j721e-hs-evm = " pru-icss" > >>+UTILS:append:j721e = " ti-rtos-firmware pru-icss" > >>+UTILS:append:j7200 = " ti-rtos-firmware" > >>+UTILS:append:j721s2 = " ti-rtos-firmware" > > > >Here - not so much. ti-rtos-firmware is applicable to all j7. So, I'd leave > >that line alone and only replace adding pru-icss to specific EVMs to adding it > >to j721e SoC family. > > > >Or go even further - ti-rtos-firmware is common to all k3 platforms, so all > >the individual am65xx, am64xx and am62xx, along with j7, could be replaced > >with one line: > > > >UTILS:append:k3 = " ti-rtos-firmware" > > > >And then add pri-icss or other extra FW to specific SoC families only. > > > > If you want I can make this re-arrangement in a follow up patch. > > > > >>diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb b/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb > >>index e16e4d51..e6e0b915 100644 > >>--- a/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb > >>+++ b/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb > >>@@ -19,7 +19,9 @@ ANALYTICS = "" > >> # ${@['','qt-opencv-opencl-opengl-multithreaded'][oe.utils.all_distro_features(d, 'opencv opencl opengl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'gpu dsp', True, False, d)]} \ > >> # ${@['','barcode-roi'][oe.utils.all_distro_features(d, 'opencv', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \ > >> #" > >>-ANALYTICS:j7 = "" > >>+ANALYTICS:j721e = "" > >>+ANALYTICS:j7200 = "" > >>+ANALYTICS:j721s2 = "" > > > >Well, this is probably completely wrong by now, anyway. > > > > Yes it probably is, but then my point in this patch was to > not make any changes to functionality (or as few as possible). > So if it is broken now, it was broken just the same before. > > > > >> ANALYTICS:omapl138 = "" > >> RDEPENDS:${PN} = "\ > >>diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-test.bb b/meta-arago-distro/recipes-core/packagegroups/ti-test.bb > >>index 99a6cc82..5f56f8be 100644 > >>--- a/meta-arago-distro/recipes-core/packagegroups/ti-test.bb > >>+++ b/meta-arago-distro/recipes-core/packagegroups/ti-test.bb > >>@@ -78,7 +78,15 @@ ARAGO_TI_TEST:append:k3 = " \ > >> k3conf \ > >> " > >>-ARAGO_TI_TEST:append:j7 = " \ > >>+ARAGO_TI_TEST:append:j721e = " \ > >>+ ufs-utils \ > >>+" > >>+ > >>+ARAGO_TI_TEST:append:j7200 = " \ > >>+ ufs-utils \ > >>+" > >>+ > >>+ARAGO_TI_TEST:append:j721s2 = " \ > >> ufs-utils \ > >> " > > > >ufs-utils is quite generic and should probably be added to k3 or maybe even > >all platforms... > > > > Same as above, would you like this done in a follow up patch? This patch only > fans out the name keeping the same functionality as before. If that exposes > existing issues or opportunities for cleanup, then I can make those next. It would have been fine to do further cleanup/optimization/collapsing of the code in a followup patch, if you weren't first expanding it here... In other words, it seems replacing "j7" override with more specific "j721e/j7200/j721s2" overrides only makes sense for DTB_FILTER case and should be left alone in other 3 places.
On 10/10/22 8:35 PM, Denys Dmytriyenko wrote: > On Mon, Oct 10, 2022 at 08:26:26AM -0500, Andrew Davis wrote: >> On 10/7/22 3:10 PM, Denys Dmytriyenko wrote: >>> On Thu, Oct 06, 2022 at 10:06:28AM -0500, Andrew Davis via lists.yoctoproject.org wrote: >>>> Now that we have SoC names, we can avoid adding features based on the >>>> board name. We expect folks to create their own boards based on these >>>> SoCs, and so using the TI made EVM board name everywhere adds extra churn >>>> when adding a new board. Plus it is more correct for most of these >>>> features as they depend on the SoC, not on the EVM board. >>>> >>>> One other thing we do here is to not use the generic "j7" name, >>>> the current and future J7 devices are far to feature diverse >>>> to group at this level. Grouping like that will lead to the wrong >>>> things getting enabled as new J7 SoCs are added. >>> >>> Hmm, this second part is rather backwards (IMO) in some places, see below. >>> >>> >>>> diff --git a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc >>>> index 3c31ba18..296eef7a 100644 >>>> --- a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc >>>> +++ b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc >>>> @@ -24,7 +24,9 @@ DTB_FILTER:am57xx-hs-evm = "${DTB_FILTER:am57xx-evm}" >>>> DTB_FILTER:ti43x = "am43" >>>> DTB_FILTER:omapl138 = "da850" >>>> DTB_FILTER:am65xx = "am65" >>>> -DTB_FILTER:j7 = "j721e" >>>> +DTB_FILTER:j721e = "j721e" >>>> +DTB_FILTER:j7200 = "j7200" >>>> +DTB_FILTER:j721s2 = "j721s2" >>> >>> Yes, here it does make perfect sense. >>> >>> >>>> diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb >>>> index f4e72a89..c01e9497 100644 >>>> --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb >>>> +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb >>>> @@ -61,9 +61,9 @@ UTILS:append:am64xx = " ti-rtos-firmware pru-icss" >>>> UTILS:append:am62xx = " ti-rtos-firmware" >>>> #UTILS:append:am65xx = " ti-rtos-firmware pru-icss pru-pwm-fw" >>>> UTILS:append:am65xx = " ti-rtos-firmware pru-icss" >>>> -UTILS:append:j7 = " ti-rtos-firmware" >>>> -UTILS:append:j721e-evm = " pru-icss" >>>> -UTILS:append:j721e-hs-evm = " pru-icss" >>>> +UTILS:append:j721e = " ti-rtos-firmware pru-icss" >>>> +UTILS:append:j7200 = " ti-rtos-firmware" >>>> +UTILS:append:j721s2 = " ti-rtos-firmware" >>> >>> Here - not so much. ti-rtos-firmware is applicable to all j7. So, I'd leave >>> that line alone and only replace adding pru-icss to specific EVMs to adding it >>> to j721e SoC family. >>> >>> Or go even further - ti-rtos-firmware is common to all k3 platforms, so all >>> the individual am65xx, am64xx and am62xx, along with j7, could be replaced >>> with one line: >>> >>> UTILS:append:k3 = " ti-rtos-firmware" >>> >>> And then add pri-icss or other extra FW to specific SoC families only. >>> >> >> If you want I can make this re-arrangement in a follow up patch. >> >>> >>>> diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb b/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb >>>> index e16e4d51..e6e0b915 100644 >>>> --- a/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb >>>> +++ b/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb >>>> @@ -19,7 +19,9 @@ ANALYTICS = "" >>>> # ${@['','qt-opencv-opencl-opengl-multithreaded'][oe.utils.all_distro_features(d, 'opencv opencl opengl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'gpu dsp', True, False, d)]} \ >>>> # ${@['','barcode-roi'][oe.utils.all_distro_features(d, 'opencv', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \ >>>> #" >>>> -ANALYTICS:j7 = "" >>>> +ANALYTICS:j721e = "" >>>> +ANALYTICS:j7200 = "" >>>> +ANALYTICS:j721s2 = "" >>> >>> Well, this is probably completely wrong by now, anyway. >>> >> >> Yes it probably is, but then my point in this patch was to >> not make any changes to functionality (or as few as possible). >> So if it is broken now, it was broken just the same before. >> >>> >>>> ANALYTICS:omapl138 = "" >>>> RDEPENDS:${PN} = "\ >>>> diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-test.bb b/meta-arago-distro/recipes-core/packagegroups/ti-test.bb >>>> index 99a6cc82..5f56f8be 100644 >>>> --- a/meta-arago-distro/recipes-core/packagegroups/ti-test.bb >>>> +++ b/meta-arago-distro/recipes-core/packagegroups/ti-test.bb >>>> @@ -78,7 +78,15 @@ ARAGO_TI_TEST:append:k3 = " \ >>>> k3conf \ >>>> " >>>> -ARAGO_TI_TEST:append:j7 = " \ >>>> +ARAGO_TI_TEST:append:j721e = " \ >>>> + ufs-utils \ >>>> +" >>>> + >>>> +ARAGO_TI_TEST:append:j7200 = " \ >>>> + ufs-utils \ >>>> +" >>>> + >>>> +ARAGO_TI_TEST:append:j721s2 = " \ >>>> ufs-utils \ >>>> " >>> >>> ufs-utils is quite generic and should probably be added to k3 or maybe even >>> all platforms... >>> Looks like UFS is only supported on J721e today, so when "j7" was used above, they only meant "j721e". Will fix. >> >> Same as above, would you like this done in a follow up patch? This patch only >> fans out the name keeping the same functionality as before. If that exposes >> existing issues or opportunities for cleanup, then I can make those next. > > It would have been fine to do further cleanup/optimization/collapsing of the > code in a followup patch, if you weren't first expanding it here... > > In other words, it seems replacing "j7" override with more specific > "j721e/j7200/j721s2" overrides only makes sense for DTB_FILTER case and > should be left alone in other 3 places. > I'll break the other ones out into patches fixing as suggested. The goal is to remove the name "j7" everywhere, grouping for the "J7" family is not useful, there is nothing common today to all J7 devices that is not also common to all K3. It is an unneeded level of grouping that is now causing issues and mistakes when adding new platforms. Andrew
diff --git a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb index ec4e0344..b49548a6 100644 --- a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb +++ b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb @@ -12,8 +12,7 @@ DEPLOY_SPL_NAME:k3 = "tispl.bin tiboot3.bin" DEPLOY_IMAGES_NAME:k3 = "bl31.bin bl32.bin" DEPLOY_IMAGES_NAME:append:am65xx = " sysfw.itb" -DEPLOY_IMAGES_NAME:append:j721e-evm = " sysfw.itb" -DEPLOY_IMAGES_NAME:append:j721e-hs-evm = " sysfw.itb" +DEPLOY_IMAGES_NAME:append:j721e = " sysfw.itb" DEPLOY_IMAGES_NAME:append:am65xx-evm = " sysfw-am65x-evm.itb sysfw-am65x_sr2-evm.itb" ARAGO_TISDK_IMAGE ?= "tisdk-core-bundle" diff --git a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc index 3c31ba18..296eef7a 100644 --- a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc +++ b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc @@ -24,7 +24,9 @@ DTB_FILTER:am57xx-hs-evm = "${DTB_FILTER:am57xx-evm}" DTB_FILTER:ti43x = "am43" DTB_FILTER:omapl138 = "da850" DTB_FILTER:am65xx = "am65" -DTB_FILTER:j7 = "j721e" +DTB_FILTER:j721e = "j721e" +DTB_FILTER:j7200 = "j7200" +DTB_FILTER:j721s2 = "j721s2" # List of target side images to build for the SDK TARGET_IMAGES = "tisdk-base-image tisdk-default-image tisdk-thinlinux-image tisdk-bootstrap-image" diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb index 9efc2cae..57118775 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb @@ -31,11 +31,7 @@ UTILS:append:k3 = " \ trusted-firmware-a-source \ " -UTILS:append:j721e-evm = " \ - pru-icss-source \ -" - -UTILS:append:j721e-hs-evm = " \ +UTILS:append:j721e = " \ pru-icss-source \ " diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb index f4e72a89..c01e9497 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb @@ -61,9 +61,9 @@ UTILS:append:am64xx = " ti-rtos-firmware pru-icss" UTILS:append:am62xx = " ti-rtos-firmware" #UTILS:append:am65xx = " ti-rtos-firmware pru-icss pru-pwm-fw" UTILS:append:am65xx = " ti-rtos-firmware pru-icss" -UTILS:append:j7 = " ti-rtos-firmware" -UTILS:append:j721e-evm = " pru-icss" -UTILS:append:j721e-hs-evm = " pru-icss" +UTILS:append:j721e = " ti-rtos-firmware pru-icss" +UTILS:append:j7200 = " ti-rtos-firmware" +UTILS:append:j721s2 = " ti-rtos-firmware" UTILS:append:omapl138 = " ti-ipc-rtos-fw" diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb b/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb index e16e4d51..e6e0b915 100644 --- a/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb +++ b/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb @@ -19,7 +19,9 @@ ANALYTICS = "" # ${@['','qt-opencv-opencl-opengl-multithreaded'][oe.utils.all_distro_features(d, 'opencv opencl opengl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'gpu dsp', True, False, d)]} \ # ${@['','barcode-roi'][oe.utils.all_distro_features(d, 'opencv', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \ #" -ANALYTICS:j7 = "" +ANALYTICS:j721e = "" +ANALYTICS:j7200 = "" +ANALYTICS:j721s2 = "" ANALYTICS:omapl138 = "" RDEPENDS:${PN} = "\ diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-test.bb b/meta-arago-distro/recipes-core/packagegroups/ti-test.bb index 99a6cc82..5f56f8be 100644 --- a/meta-arago-distro/recipes-core/packagegroups/ti-test.bb +++ b/meta-arago-distro/recipes-core/packagegroups/ti-test.bb @@ -78,7 +78,15 @@ ARAGO_TI_TEST:append:k3 = " \ k3conf \ " -ARAGO_TI_TEST:append:j7 = " \ +ARAGO_TI_TEST:append:j721e = " \ + ufs-utils \ +" + +ARAGO_TI_TEST:append:j7200 = " \ + ufs-utils \ +" + +ARAGO_TI_TEST:append:j721s2 = " \ ufs-utils \ " diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_sysfw-image b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_sysfw-image index cee03bc2..09918cbc 100644 --- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_sysfw-image +++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_sysfw-image @@ -7,10 +7,8 @@ PLATFORM_TYPE = $(PLATFORM_TYPE_$(PLATFORM)) SYSFW_CONFIG = evm SYSFW_SOC_$(PLATFORM) = NULL -SYSFW_SOC_am65xx-evm = am65x -SYSFW_SOC_am65xx-hs-evm = am65x -SYSFW_SOC_j721e-evm = j721e -SYSFW_SOC_j721e-hs-evm = j721e +SYSFW_SOC_am65xx = am65x +SYSFW_SOC_j721e = j721e SYSFW_SOC = $(SYSFW_SOC_$(PLATFORM)) SYSFW_PREFIX = ti-sci-firmware diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.%.bbappend b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.%.bbappend index de9f1c7d..5cc57460 100644 --- a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.%.bbappend +++ b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.%.bbappend @@ -28,11 +28,7 @@ SRC_URI:append:am65xx = " \ ${GSTDRM_WAYLANDSINK_PATCHES} \ " -SRC_URI:append:j721e-evm = " \ - ${GSTDRM_WAYLANDSINK_PATCHES} \ -" - -SRC_URI:append:j721e-hs-evm = " \ +SRC_URI:append:j721e = " \ ${GSTDRM_WAYLANDSINK_PATCHES} \ "
Now that we have SoC names, we can avoid adding features based on the board name. We expect folks to create their own boards based on these SoCs, and so using the TI made EVM board name everywhere adds extra churn when adding a new board. Plus it is more correct for most of these features as they depend on the SoC, not on the EVM board. One other thing we do here is to not use the generic "j7" name, the current and future J7 devices are far to feature diverse to group at this level. Grouping like that will lead to the wrong things getting enabled as new J7 SoCs are added. Signed-off-by: Andrew Davis <afd@ti.com> --- .../recipes-core/images/tisdk-core-bundle.bb | 3 +-- .../recipes-core/images/tisdk-core-bundle.inc | 4 +++- .../packagegroup-arago-tisdk-addons-sdk-host.bb | 6 +----- .../packagegroups/packagegroup-arago-tisdk-addons.bb | 6 +++--- .../recipes-core/packagegroups/ti-analytics.bb | 4 +++- .../recipes-core/packagegroups/ti-test.bb | 10 +++++++++- .../ti-tisdk-makefile/Makefile_sysfw-image | 6 ++---- .../gstreamer/gstreamer1.0-plugins-bad_1.16.%.bbappend | 6 +----- 8 files changed, 23 insertions(+), 22 deletions(-)