diff mbox series

[master/kirkstone,5/5] conf: beagle*: recommend essential FW images for Beagle devices

Message ID 20231020204458.546852-5-denis@denix.org
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series [master/kirkstone,1/5] conf: beaglebone-ai64: trim down the DTB list | expand

Commit Message

Denys Dmytriyenko Oct. 20, 2023, 8:44 p.m. UTC
From: Denys Dmytriyenko <denys@konsulko.com>

Set MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS per platform to list recommended
essential FW images to be added to rootfs by default.

Correct beagle-x15 to pull devicetrees and kernel image as well.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/conf/machine/beagle-x15.conf      | 2 ++
 meta-ti-bsp/conf/machine/beaglebone-ai64.conf | 3 +++
 meta-ti-bsp/conf/machine/beaglebone.conf      | 2 ++
 meta-ti-bsp/conf/machine/beagleplay.conf      | 3 +++
 4 files changed, 10 insertions(+)

Comments

Andrew Davis Oct. 23, 2023, 3:50 p.m. UTC | #1
On 10/20/23 3:44 PM, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys@konsulko.com>
> 
> Set MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS per platform to list recommended
> essential FW images to be added to rootfs by default.
> 
> Correct beagle-x15 to pull devicetrees and kernel image as well.
> 

Would it be better to have the bb.org kernel pull in `kernel-rdepends.inc` like
the other kernels and get all these RDEPENDS/RRECOMMENDS from that?

Andrew

> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> ---
>   meta-ti-bsp/conf/machine/beagle-x15.conf      | 2 ++
>   meta-ti-bsp/conf/machine/beaglebone-ai64.conf | 3 +++
>   meta-ti-bsp/conf/machine/beaglebone.conf      | 2 ++
>   meta-ti-bsp/conf/machine/beagleplay.conf      | 3 +++
>   4 files changed, 10 insertions(+)
> 
> diff --git a/meta-ti-bsp/conf/machine/beagle-x15.conf b/meta-ti-bsp/conf/machine/beagle-x15.conf
> index be27705c..3b857165 100644
> --- a/meta-ti-bsp/conf/machine/beagle-x15.conf
> +++ b/meta-ti-bsp/conf/machine/beagle-x15.conf
> @@ -19,3 +19,5 @@ MACHINE_GUI_CLASS = "bigscreen"
>   SERIAL_CONSOLES = "115200;ttyS2"
>   
>   UBOOT_MACHINE = "am57xx_evm_config"
> +
> +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-zimage"
> diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> index 2f9c7288..3f5a027e 100644
> --- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> +++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> @@ -24,4 +24,7 @@ ti/k3-j721e-sk.dtb \
>   "
>   
>   MACHINE_GUI_CLASS = "bigscreen"
> +
>   MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-image"
> +
> +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw"
> diff --git a/meta-ti-bsp/conf/machine/beaglebone.conf b/meta-ti-bsp/conf/machine/beaglebone.conf
> index 2d811d0d..45944ce8 100644
> --- a/meta-ti-bsp/conf/machine/beaglebone.conf
> +++ b/meta-ti-bsp/conf/machine/beaglebone.conf
> @@ -23,3 +23,5 @@ MACHINE_FEATURES += "screen"
>   SERIAL_CONSOLES = "115200;ttyS0"
>   
>   MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-zimage"
> +
> +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "amx3-cm3"
> diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf
> index 6a0f697f..4dd550a1 100644
> --- a/meta-ti-bsp/conf/machine/beagleplay.conf
> +++ b/meta-ti-bsp/conf/machine/beagleplay.conf
> @@ -42,4 +42,7 @@ ti/k3-am625-sk-rpi-hdr-pwm.dtbo \
>   "
>   
>   MACHINE_GUI_CLASS = "bigscreen"
> +
>   MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-image"
> +
> +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += ""
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#17160): https://lists.yoctoproject.org/g/meta-ti/message/17160
> Mute This Topic: https://lists.yoctoproject.org/mt/102089684/3619733
> Group Owner: meta-ti+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/leave/6695306/3619733/2033773410/xyzzy [afd@ti.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Ryan Eatmon Oct. 23, 2023, 3:52 p.m. UTC | #2
On 10/23/2023 10:50 AM, Andrew Davis via lists.yoctoproject.org wrote:
> On 10/20/23 3:44 PM, Denys Dmytriyenko wrote:
>> From: Denys Dmytriyenko <denys@konsulko.com>
>>
>> Set MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS per platform to list recommended
>> essential FW images to be added to rootfs by default.
>>
>> Correct beagle-x15 to pull devicetrees and kernel image as well.
>>
> 
> Would it be better to have the bb.org kernel pull in 
> `kernel-rdepends.inc` like
> the other kernels and get all these RDEPENDS/RRECOMMENDS from that?

Someone submitted that patch earlier and I was hoping that Denys was 
going to address it as part of this series.


> Andrew
> 
>> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
>> ---
>>   meta-ti-bsp/conf/machine/beagle-x15.conf      | 2 ++
>>   meta-ti-bsp/conf/machine/beaglebone-ai64.conf | 3 +++
>>   meta-ti-bsp/conf/machine/beaglebone.conf      | 2 ++
>>   meta-ti-bsp/conf/machine/beagleplay.conf      | 3 +++
>>   4 files changed, 10 insertions(+)
>>
>> diff --git a/meta-ti-bsp/conf/machine/beagle-x15.conf 
>> b/meta-ti-bsp/conf/machine/beagle-x15.conf
>> index be27705c..3b857165 100644
>> --- a/meta-ti-bsp/conf/machine/beagle-x15.conf
>> +++ b/meta-ti-bsp/conf/machine/beagle-x15.conf
>> @@ -19,3 +19,5 @@ MACHINE_GUI_CLASS = "bigscreen"
>>   SERIAL_CONSOLES = "115200;ttyS2"
>>   UBOOT_MACHINE = "am57xx_evm_config"
>> +
>> +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree 
>> kernel-image-zimage"
>> diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf 
>> b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
>> index 2f9c7288..3f5a027e 100644
>> --- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
>> +++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
>> @@ -24,4 +24,7 @@ ti/k3-j721e-sk.dtb \
>>   "
>>   MACHINE_GUI_CLASS = "bigscreen"
>> +
>>   MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree 
>> kernel-image-image"
>> +
>> +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw"
>> diff --git a/meta-ti-bsp/conf/machine/beaglebone.conf 
>> b/meta-ti-bsp/conf/machine/beaglebone.conf
>> index 2d811d0d..45944ce8 100644
>> --- a/meta-ti-bsp/conf/machine/beaglebone.conf
>> +++ b/meta-ti-bsp/conf/machine/beaglebone.conf
>> @@ -23,3 +23,5 @@ MACHINE_FEATURES += "screen"
>>   SERIAL_CONSOLES = "115200;ttyS0"
>>   MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree 
>> kernel-image-zimage"
>> +
>> +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "amx3-cm3"
>> diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf 
>> b/meta-ti-bsp/conf/machine/beagleplay.conf
>> index 6a0f697f..4dd550a1 100644
>> --- a/meta-ti-bsp/conf/machine/beagleplay.conf
>> +++ b/meta-ti-bsp/conf/machine/beagleplay.conf
>> @@ -42,4 +42,7 @@ ti/k3-am625-sk-rpi-hdr-pwm.dtbo \
>>   "
>>   MACHINE_GUI_CLASS = "bigscreen"
>> +
>>   MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree 
>> kernel-image-image"
>> +
>> +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += ""
>>
>>
>>
>>
>>
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#17166): https://lists.yoctoproject.org/g/meta-ti/message/17166
> Mute This Topic: https://lists.yoctoproject.org/mt/102089684/6551054
> Group Owner: meta-ti+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [reatmon@ti.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Denys Dmytriyenko Oct. 23, 2023, 4:56 p.m. UTC | #3
On Mon, Oct 23, 2023 at 10:50:43AM -0500, Andrew Davis wrote:
> On 10/20/23 3:44 PM, Denys Dmytriyenko wrote:
> >From: Denys Dmytriyenko <denys@konsulko.com>
> >
> >Set MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS per platform to list recommended
> >essential FW images to be added to rootfs by default.
> >
> >Correct beagle-x15 to pull devicetrees and kernel image as well.
> >
> 
> Would it be better to have the bb.org kernel pull in `kernel-rdepends.inc` like
> the other kernels and get all these RDEPENDS/RRECOMMENDS from that?

No, I was actually working on the opposite - moving those to corresponding    
machine/SoC configs and removing kernel-rdepends.inc

MACHINE_ESSENTIAL_EXTRA_RDEPENDS and MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS are 
a proper way to express such dependencies for things like FW images to be 
pulled into an image, instead of making kernel RDEPENDS on them. And it is 
not specific to a particular kernel, so you don't need to keep including that 
kernel-rdepends.inc from every kernel recipe.


> >Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> >---
> >  meta-ti-bsp/conf/machine/beagle-x15.conf      | 2 ++
> >  meta-ti-bsp/conf/machine/beaglebone-ai64.conf | 3 +++
> >  meta-ti-bsp/conf/machine/beaglebone.conf      | 2 ++
> >  meta-ti-bsp/conf/machine/beagleplay.conf      | 3 +++
> >  4 files changed, 10 insertions(+)
> >
> >diff --git a/meta-ti-bsp/conf/machine/beagle-x15.conf b/meta-ti-bsp/conf/machine/beagle-x15.conf
> >index be27705c..3b857165 100644
> >--- a/meta-ti-bsp/conf/machine/beagle-x15.conf
> >+++ b/meta-ti-bsp/conf/machine/beagle-x15.conf
> >@@ -19,3 +19,5 @@ MACHINE_GUI_CLASS = "bigscreen"
> >  SERIAL_CONSOLES = "115200;ttyS2"
> >  UBOOT_MACHINE = "am57xx_evm_config"
> >+
> >+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-zimage"
> >diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> >index 2f9c7288..3f5a027e 100644
> >--- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> >+++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> >@@ -24,4 +24,7 @@ ti/k3-j721e-sk.dtb \
> >  "
> >  MACHINE_GUI_CLASS = "bigscreen"
> >+
> >  MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-image"
> >+
> >+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw"
> >diff --git a/meta-ti-bsp/conf/machine/beaglebone.conf b/meta-ti-bsp/conf/machine/beaglebone.conf
> >index 2d811d0d..45944ce8 100644
> >--- a/meta-ti-bsp/conf/machine/beaglebone.conf
> >+++ b/meta-ti-bsp/conf/machine/beaglebone.conf
> >@@ -23,3 +23,5 @@ MACHINE_FEATURES += "screen"
> >  SERIAL_CONSOLES = "115200;ttyS0"
> >  MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-zimage"
> >+
> >+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "amx3-cm3"
> >diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf
> >index 6a0f697f..4dd550a1 100644
> >--- a/meta-ti-bsp/conf/machine/beagleplay.conf
> >+++ b/meta-ti-bsp/conf/machine/beagleplay.conf
> >@@ -42,4 +42,7 @@ ti/k3-am625-sk-rpi-hdr-pwm.dtbo \
> >  "
> >  MACHINE_GUI_CLASS = "bigscreen"
> >+
> >  MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-image"
> >+
> >+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += ""
Denys Dmytriyenko Oct. 23, 2023, 4:56 p.m. UTC | #4
On Mon, Oct 23, 2023 at 10:52:49AM -0500, Ryan Eatmon wrote:
> 
> 
> On 10/23/2023 10:50 AM, Andrew Davis via lists.yoctoproject.org wrote:
> >On 10/20/23 3:44 PM, Denys Dmytriyenko wrote:
> >>From: Denys Dmytriyenko <denys@konsulko.com>
> >>
> >>Set MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS per platform to list recommended
> >>essential FW images to be added to rootfs by default.
> >>
> >>Correct beagle-x15 to pull devicetrees and kernel image as well.
> >>
> >
> >Would it be better to have the bb.org kernel pull in
> >`kernel-rdepends.inc` like
> >the other kernels and get all these RDEPENDS/RRECOMMENDS from that?
> 
> Someone submitted that patch earlier and I was hoping that Denys was
> going to address it as part of this series.

Yes, this patch does address it.


> >>Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> >>---
> >>  meta-ti-bsp/conf/machine/beagle-x15.conf      | 2 ++
> >>  meta-ti-bsp/conf/machine/beaglebone-ai64.conf | 3 +++
> >>  meta-ti-bsp/conf/machine/beaglebone.conf      | 2 ++
> >>  meta-ti-bsp/conf/machine/beagleplay.conf      | 3 +++
> >>  4 files changed, 10 insertions(+)
> >>
> >>diff --git a/meta-ti-bsp/conf/machine/beagle-x15.conf
> >>b/meta-ti-bsp/conf/machine/beagle-x15.conf
> >>index be27705c..3b857165 100644
> >>--- a/meta-ti-bsp/conf/machine/beagle-x15.conf
> >>+++ b/meta-ti-bsp/conf/machine/beagle-x15.conf
> >>@@ -19,3 +19,5 @@ MACHINE_GUI_CLASS = "bigscreen"
> >>  SERIAL_CONSOLES = "115200;ttyS2"
> >>  UBOOT_MACHINE = "am57xx_evm_config"
> >>+
> >>+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree
> >>kernel-image-zimage"
> >>diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> >>b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> >>index 2f9c7288..3f5a027e 100644
> >>--- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> >>+++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> >>@@ -24,4 +24,7 @@ ti/k3-j721e-sk.dtb \
> >>  "
> >>  MACHINE_GUI_CLASS = "bigscreen"
> >>+
> >>  MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree
> >>kernel-image-image"
> >>+
> >>+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw"
> >>diff --git a/meta-ti-bsp/conf/machine/beaglebone.conf
> >>b/meta-ti-bsp/conf/machine/beaglebone.conf
> >>index 2d811d0d..45944ce8 100644
> >>--- a/meta-ti-bsp/conf/machine/beaglebone.conf
> >>+++ b/meta-ti-bsp/conf/machine/beaglebone.conf
> >>@@ -23,3 +23,5 @@ MACHINE_FEATURES += "screen"
> >>  SERIAL_CONSOLES = "115200;ttyS0"
> >>  MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree
> >>kernel-image-zimage"
> >>+
> >>+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "amx3-cm3"
> >>diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf
> >>b/meta-ti-bsp/conf/machine/beagleplay.conf
> >>index 6a0f697f..4dd550a1 100644
> >>--- a/meta-ti-bsp/conf/machine/beagleplay.conf
> >>+++ b/meta-ti-bsp/conf/machine/beagleplay.conf
> >>@@ -42,4 +42,7 @@ ti/k3-am625-sk-rpi-hdr-pwm.dtbo \
> >>  "
> >>  MACHINE_GUI_CLASS = "bigscreen"
> >>+
> >>  MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree
> >>kernel-image-image"
> >>+
> >>+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += ""
Andrew Davis Oct. 23, 2023, 5:18 p.m. UTC | #5
On 10/23/23 11:56 AM, Denys Dmytriyenko wrote:
> On Mon, Oct 23, 2023 at 10:50:43AM -0500, Andrew Davis wrote:
>> On 10/20/23 3:44 PM, Denys Dmytriyenko wrote:
>>> From: Denys Dmytriyenko <denys@konsulko.com>
>>>
>>> Set MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS per platform to list recommended
>>> essential FW images to be added to rootfs by default.
>>>
>>> Correct beagle-x15 to pull devicetrees and kernel image as well.
>>>
>>
>> Would it be better to have the bb.org kernel pull in `kernel-rdepends.inc` like
>> the other kernels and get all these RDEPENDS/RRECOMMENDS from that?
> 
> No, I was actually working on the opposite - moving those to corresponding
> machine/SoC configs and removing kernel-rdepends.inc
> 
> MACHINE_ESSENTIAL_EXTRA_RDEPENDS and MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS are
> a proper way to express such dependencies for things like FW images to be
> pulled into an image, instead of making kernel RDEPENDS on them. And it is
> not specific to a particular kernel, so you don't need to keep including that
> kernel-rdepends.inc from every kernel recipe.
> 

If you are going to do it this way for all platforms, then you should
be able to do this in the machine/include/*.inc files vs out here
in each and every machine. So my question would be, if this is the right
direction, why only the Beagle plats in this patch?

Andrew

> 
>>> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
>>> ---
>>>   meta-ti-bsp/conf/machine/beagle-x15.conf      | 2 ++
>>>   meta-ti-bsp/conf/machine/beaglebone-ai64.conf | 3 +++
>>>   meta-ti-bsp/conf/machine/beaglebone.conf      | 2 ++
>>>   meta-ti-bsp/conf/machine/beagleplay.conf      | 3 +++
>>>   4 files changed, 10 insertions(+)
>>>
>>> diff --git a/meta-ti-bsp/conf/machine/beagle-x15.conf b/meta-ti-bsp/conf/machine/beagle-x15.conf
>>> index be27705c..3b857165 100644
>>> --- a/meta-ti-bsp/conf/machine/beagle-x15.conf
>>> +++ b/meta-ti-bsp/conf/machine/beagle-x15.conf
>>> @@ -19,3 +19,5 @@ MACHINE_GUI_CLASS = "bigscreen"
>>>   SERIAL_CONSOLES = "115200;ttyS2"
>>>   UBOOT_MACHINE = "am57xx_evm_config"
>>> +
>>> +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-zimage"
>>> diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
>>> index 2f9c7288..3f5a027e 100644
>>> --- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
>>> +++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
>>> @@ -24,4 +24,7 @@ ti/k3-j721e-sk.dtb \
>>>   "
>>>   MACHINE_GUI_CLASS = "bigscreen"
>>> +
>>>   MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-image"
>>> +
>>> +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw"
>>> diff --git a/meta-ti-bsp/conf/machine/beaglebone.conf b/meta-ti-bsp/conf/machine/beaglebone.conf
>>> index 2d811d0d..45944ce8 100644
>>> --- a/meta-ti-bsp/conf/machine/beaglebone.conf
>>> +++ b/meta-ti-bsp/conf/machine/beaglebone.conf
>>> @@ -23,3 +23,5 @@ MACHINE_FEATURES += "screen"
>>>   SERIAL_CONSOLES = "115200;ttyS0"
>>>   MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-zimage"
>>> +
>>> +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "amx3-cm3"
>>> diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf
>>> index 6a0f697f..4dd550a1 100644
>>> --- a/meta-ti-bsp/conf/machine/beagleplay.conf
>>> +++ b/meta-ti-bsp/conf/machine/beagleplay.conf
>>> @@ -42,4 +42,7 @@ ti/k3-am625-sk-rpi-hdr-pwm.dtbo \
>>>   "
>>>   MACHINE_GUI_CLASS = "bigscreen"
>>> +
>>>   MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-image"
>>> +
>>> +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += ""
Denys Dmytriyenko Oct. 23, 2023, 7:03 p.m. UTC | #6
On Mon, Oct 23, 2023 at 12:18:18PM -0500, Andrew Davis wrote:
> On 10/23/23 11:56 AM, Denys Dmytriyenko wrote:
> >On Mon, Oct 23, 2023 at 10:50:43AM -0500, Andrew Davis wrote:
> >>On 10/20/23 3:44 PM, Denys Dmytriyenko wrote:
> >>>From: Denys Dmytriyenko <denys@konsulko.com>
> >>>
> >>>Set MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS per platform to list recommended
> >>>essential FW images to be added to rootfs by default.
> >>>
> >>>Correct beagle-x15 to pull devicetrees and kernel image as well.
> >>>
> >>
> >>Would it be better to have the bb.org kernel pull in `kernel-rdepends.inc` like
> >>the other kernels and get all these RDEPENDS/RRECOMMENDS from that?
> >
> >No, I was actually working on the opposite - moving those to corresponding
> >machine/SoC configs and removing kernel-rdepends.inc
> >
> >MACHINE_ESSENTIAL_EXTRA_RDEPENDS and MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS are
> >a proper way to express such dependencies for things like FW images to be
> >pulled into an image, instead of making kernel RDEPENDS on them. And it is
> >not specific to a particular kernel, so you don't need to keep including that
> >kernel-rdepends.inc from every kernel recipe.
> >
> 
> If you are going to do it this way for all platforms, then you should
> be able to do this in the machine/include/*.inc files vs out here
> in each and every machine.

Yes, that's what I said above - "corresponding machine/SoC configs".
See the RFC patch I just sent to the list a bit earlier.


> So my question would be, if this is the right
> direction, why only the Beagle plats in this patch?

The main reason was Ravi's multiple revisions trying to remove PRU Eth 
firmware images from kernel-rdepends.inc - didn't want to step over that and 
require even more iterations... Now that it is dropped, this is no longer a 
blocker.


> >>>Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> >>>---
> >>>  meta-ti-bsp/conf/machine/beagle-x15.conf      | 2 ++
> >>>  meta-ti-bsp/conf/machine/beaglebone-ai64.conf | 3 +++
> >>>  meta-ti-bsp/conf/machine/beaglebone.conf      | 2 ++
> >>>  meta-ti-bsp/conf/machine/beagleplay.conf      | 3 +++
> >>>  4 files changed, 10 insertions(+)
> >>>
> >>>diff --git a/meta-ti-bsp/conf/machine/beagle-x15.conf b/meta-ti-bsp/conf/machine/beagle-x15.conf
> >>>index be27705c..3b857165 100644
> >>>--- a/meta-ti-bsp/conf/machine/beagle-x15.conf
> >>>+++ b/meta-ti-bsp/conf/machine/beagle-x15.conf
> >>>@@ -19,3 +19,5 @@ MACHINE_GUI_CLASS = "bigscreen"
> >>>  SERIAL_CONSOLES = "115200;ttyS2"
> >>>  UBOOT_MACHINE = "am57xx_evm_config"
> >>>+
> >>>+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-zimage"
> >>>diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> >>>index 2f9c7288..3f5a027e 100644
> >>>--- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> >>>+++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> >>>@@ -24,4 +24,7 @@ ti/k3-j721e-sk.dtb \
> >>>  "
> >>>  MACHINE_GUI_CLASS = "bigscreen"
> >>>+
> >>>  MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-image"
> >>>+
> >>>+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw"
> >>>diff --git a/meta-ti-bsp/conf/machine/beaglebone.conf b/meta-ti-bsp/conf/machine/beaglebone.conf
> >>>index 2d811d0d..45944ce8 100644
> >>>--- a/meta-ti-bsp/conf/machine/beaglebone.conf
> >>>+++ b/meta-ti-bsp/conf/machine/beaglebone.conf
> >>>@@ -23,3 +23,5 @@ MACHINE_FEATURES += "screen"
> >>>  SERIAL_CONSOLES = "115200;ttyS0"
> >>>  MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-zimage"
> >>>+
> >>>+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "amx3-cm3"
> >>>diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf
> >>>index 6a0f697f..4dd550a1 100644
> >>>--- a/meta-ti-bsp/conf/machine/beagleplay.conf
> >>>+++ b/meta-ti-bsp/conf/machine/beagleplay.conf
> >>>@@ -42,4 +42,7 @@ ti/k3-am625-sk-rpi-hdr-pwm.dtbo \
> >>>  "
> >>>  MACHINE_GUI_CLASS = "bigscreen"
> >>>+
> >>>  MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-image"
> >>>+
> >>>+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += ""
diff mbox series

Patch

diff --git a/meta-ti-bsp/conf/machine/beagle-x15.conf b/meta-ti-bsp/conf/machine/beagle-x15.conf
index be27705c..3b857165 100644
--- a/meta-ti-bsp/conf/machine/beagle-x15.conf
+++ b/meta-ti-bsp/conf/machine/beagle-x15.conf
@@ -19,3 +19,5 @@  MACHINE_GUI_CLASS = "bigscreen"
 SERIAL_CONSOLES = "115200;ttyS2"
 
 UBOOT_MACHINE = "am57xx_evm_config"
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-zimage"
diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
index 2f9c7288..3f5a027e 100644
--- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
+++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
@@ -24,4 +24,7 @@  ti/k3-j721e-sk.dtb \
 "
 
 MACHINE_GUI_CLASS = "bigscreen"
+
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-image"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw"
diff --git a/meta-ti-bsp/conf/machine/beaglebone.conf b/meta-ti-bsp/conf/machine/beaglebone.conf
index 2d811d0d..45944ce8 100644
--- a/meta-ti-bsp/conf/machine/beaglebone.conf
+++ b/meta-ti-bsp/conf/machine/beaglebone.conf
@@ -23,3 +23,5 @@  MACHINE_FEATURES += "screen"
 SERIAL_CONSOLES = "115200;ttyS0"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-zimage"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "amx3-cm3"
diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf
index 6a0f697f..4dd550a1 100644
--- a/meta-ti-bsp/conf/machine/beagleplay.conf
+++ b/meta-ti-bsp/conf/machine/beagleplay.conf
@@ -42,4 +42,7 @@  ti/k3-am625-sk-rpi-hdr-pwm.dtbo \
 "
 
 MACHINE_GUI_CLASS = "bigscreen"
+
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-image"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += ""