diff mbox series

[meta-ti,master] conf: machine: beagle: Centralize some settings for all beagle boards

Message ID 20240313162149.18098-1-reatmon@ti.com
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series [meta-ti,master] conf: machine: beagle: Centralize some settings for all beagle boards | expand

Commit Message

Ryan Eatmon March 13, 2024, 4:21 p.m. UTC 
We have a request to be able to override the beagle kernel set in
PREFERRED_PROVIDER_virtual/kernel, but it is being absolutely set and
not loosely set with ?=.  Take this time to create a central include for
all beagle boards like we have for the k3.inc.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
 meta-ti-bsp/conf/machine/beagle-x15.conf      | 3 +--
 meta-ti-bsp/conf/machine/beaglebone-ai64.conf | 3 +--
 meta-ti-bsp/conf/machine/beaglebone.conf      | 3 +--
 meta-ti-bsp/conf/machine/beagleplay.conf      | 2 +-
 meta-ti-bsp/conf/machine/include/beagle.inc   | 3 +++
 5 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 meta-ti-bsp/conf/machine/include/beagle.inc

Comments

Denys Dmytriyenko March 13, 2024, 4:53 p.m. UTC | #1 
On Wed, Mar 13, 2024 at 11:21:49AM -0500, Ryan Eatmon via lists.yoctoproject.org wrote:
> We have a request to be able to override the beagle kernel set in
> PREFERRED_PROVIDER_virtual/kernel, but it is being absolutely set and
> not loosely set with ?=.

One can always use override - any override will do, e.g. machine:

PREFERRED_PROVIDER_virtual/kernel:beagleplay = "linux-custom"


>  Take this time to create a central include for
> all beagle boards like we have for the k3.inc.

Should virtual/bootloader and u-boot preferences be moved there as well?


> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
> ---
>  meta-ti-bsp/conf/machine/beagle-x15.conf      | 3 +--
>  meta-ti-bsp/conf/machine/beaglebone-ai64.conf | 3 +--
>  meta-ti-bsp/conf/machine/beaglebone.conf      | 3 +--
>  meta-ti-bsp/conf/machine/beagleplay.conf      | 2 +-
>  meta-ti-bsp/conf/machine/include/beagle.inc   | 3 +++
>  5 files changed, 7 insertions(+), 7 deletions(-)
>  create mode 100644 meta-ti-bsp/conf/machine/include/beagle.inc
> 
> diff --git a/meta-ti-bsp/conf/machine/beagle-x15.conf b/meta-ti-bsp/conf/machine/beagle-x15.conf
> index d368fe1a..6fc7957c 100644
> --- a/meta-ti-bsp/conf/machine/beagle-x15.conf
> +++ b/meta-ti-bsp/conf/machine/beagle-x15.conf
> @@ -2,10 +2,9 @@
>  #@NAME: BeagleBoard X15
>  #@DESCRIPTION: Machine configuration for the BeagleBoard X15
>  
> +require conf/machine/include/beagle.inc
>  require conf/machine/include/am57xx.inc
>  
> -PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
> -
>  KERNEL_DEVICETREE_PREFIX = "am57xx-beagle-x15"
>  
>  KERNEL_DEVICETREE = " \
> diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> index a19a3e29..8ec52bba 100644
> --- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> +++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> @@ -2,6 +2,7 @@
>  #@NAME: BeagleBone AI-64 (A72)
>  #@DESCRIPTION: Machine configuration for the BeagleBone AI-64 board (A72 core)
>  
> +require conf/machine/include/beagle.inc
>  require conf/machine/include/j721e.inc
>  
>  UBOOT_MACHINE = "j721e_evm_a72_config"
> @@ -12,8 +13,6 @@ UBOOT_MACHINE = "j721e_evm_a72_config"
>  # under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
>  UBOOT_CONFIG_FRAGMENTS = "j721e_beagleboneai64_a72.config"
>  
> -PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
> -
>  KERNEL_DEVICETREE = " \
>  ti/k3-j721e-beagleboneai64.dtb \
>  ti/k3-j721e-common-proc-board.dtb \
> diff --git a/meta-ti-bsp/conf/machine/beaglebone.conf b/meta-ti-bsp/conf/machine/beaglebone.conf
> index 7f78b297..8b8b9d29 100644
> --- a/meta-ti-bsp/conf/machine/beaglebone.conf
> +++ b/meta-ti-bsp/conf/machine/beaglebone.conf
> @@ -2,10 +2,9 @@
>  #@NAME: BeagleBone machine
>  #@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board
>  
> +require conf/machine/include/beagle.inc
>  require conf/machine/include/ti33x.inc
>  
> -PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
> -
>  KERNEL_DEVICETREE_PREFIX = "am335x-bone"
>  
>  KERNEL_DEVICETREE = " \
> diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf
> index 9f926b86..75e62afd 100644
> --- a/meta-ti-bsp/conf/machine/beagleplay.conf
> +++ b/meta-ti-bsp/conf/machine/beagleplay.conf
> @@ -2,6 +2,7 @@
>  #@NAME: BeaglePlay (A53)
>  #@DESCRIPTION: Machine configuration for the BeaglePlay board (A53 core)
>  
> +require conf/machine//include/beagle.inc
>  require conf/machine/include/k3.inc
>  SOC_FAMILY:append = ":am62xx"
>  
> @@ -24,7 +25,6 @@ UBOOT_MACHINE = "am62x_evm_a53_defconfig"
>  # under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
>  UBOOT_CONFIG_FRAGMENTS = "am625_beagleplay_a53.config"
>  
> -PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
>  PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
>  PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
>  
> diff --git a/meta-ti-bsp/conf/machine/include/beagle.inc b/meta-ti-bsp/conf/machine/include/beagle.inc
> new file mode 100644
> index 00000000..27e3298d
> --- /dev/null
> +++ b/meta-ti-bsp/conf/machine/include/beagle.inc
> @@ -0,0 +1,3 @@
> +
> +PREFERRED_PROVIDER_virtual/kernel ?= "linux-bb.org"
> +
> -- 
> 2.17.1
Ryan Eatmon March 13, 2024, 7:56 p.m. UTC | #2 
On 3/13/2024 11:53 AM, Denys Dmytriyenko wrote:
> On Wed, Mar 13, 2024 at 11:21:49AM -0500, Ryan Eatmon via lists.yoctoproject.org wrote:
>> We have a request to be able to override the beagle kernel set in
>> PREFERRED_PROVIDER_virtual/kernel, but it is being absolutely set and
>> not loosely set with ?=.
> 
> One can always use override - any override will do, e.g. machine:
> 
> PREFERRED_PROVIDER_virtual/kernel:beagleplay = "linux-custom"

I would agree, but the request was to support our upstream build flow 
with just changing the MACHINE=beagleplay on the bitbake line.  So doing 
this make it "better" and more uniform.  The user does not have to edit 
the local.conf they can just run.

> 
>>   Take this time to create a central include for
>> all beagle boards like we have for the k3.inc.
> 
> Should virtual/bootloader and u-boot preferences be moved there as well?

Generally, yes.  But, Andrew submitted a patch that removed the beagle 
uboot recipe, and you added it back in only for beaglplay... so there 
was nothing common about the uboot stuff at that point.


> 
>> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
>> ---
>>   meta-ti-bsp/conf/machine/beagle-x15.conf      | 3 +--
>>   meta-ti-bsp/conf/machine/beaglebone-ai64.conf | 3 +--
>>   meta-ti-bsp/conf/machine/beaglebone.conf      | 3 +--
>>   meta-ti-bsp/conf/machine/beagleplay.conf      | 2 +-
>>   meta-ti-bsp/conf/machine/include/beagle.inc   | 3 +++
>>   5 files changed, 7 insertions(+), 7 deletions(-)
>>   create mode 100644 meta-ti-bsp/conf/machine/include/beagle.inc
>>
>> diff --git a/meta-ti-bsp/conf/machine/beagle-x15.conf b/meta-ti-bsp/conf/machine/beagle-x15.conf
>> index d368fe1a..6fc7957c 100644
>> --- a/meta-ti-bsp/conf/machine/beagle-x15.conf
>> +++ b/meta-ti-bsp/conf/machine/beagle-x15.conf
>> @@ -2,10 +2,9 @@
>>   #@NAME: BeagleBoard X15
>>   #@DESCRIPTION: Machine configuration for the BeagleBoard X15
>>   
>> +require conf/machine/include/beagle.inc
>>   require conf/machine/include/am57xx.inc
>>   
>> -PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
>> -
>>   KERNEL_DEVICETREE_PREFIX = "am57xx-beagle-x15"
>>   
>>   KERNEL_DEVICETREE = " \
>> diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
>> index a19a3e29..8ec52bba 100644
>> --- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
>> +++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
>> @@ -2,6 +2,7 @@
>>   #@NAME: BeagleBone AI-64 (A72)
>>   #@DESCRIPTION: Machine configuration for the BeagleBone AI-64 board (A72 core)
>>   
>> +require conf/machine/include/beagle.inc
>>   require conf/machine/include/j721e.inc
>>   
>>   UBOOT_MACHINE = "j721e_evm_a72_config"
>> @@ -12,8 +13,6 @@ UBOOT_MACHINE = "j721e_evm_a72_config"
>>   # under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
>>   UBOOT_CONFIG_FRAGMENTS = "j721e_beagleboneai64_a72.config"
>>   
>> -PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
>> -
>>   KERNEL_DEVICETREE = " \
>>   ti/k3-j721e-beagleboneai64.dtb \
>>   ti/k3-j721e-common-proc-board.dtb \
>> diff --git a/meta-ti-bsp/conf/machine/beaglebone.conf b/meta-ti-bsp/conf/machine/beaglebone.conf
>> index 7f78b297..8b8b9d29 100644
>> --- a/meta-ti-bsp/conf/machine/beaglebone.conf
>> +++ b/meta-ti-bsp/conf/machine/beaglebone.conf
>> @@ -2,10 +2,9 @@
>>   #@NAME: BeagleBone machine
>>   #@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board
>>   
>> +require conf/machine/include/beagle.inc
>>   require conf/machine/include/ti33x.inc
>>   
>> -PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
>> -
>>   KERNEL_DEVICETREE_PREFIX = "am335x-bone"
>>   
>>   KERNEL_DEVICETREE = " \
>> diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf
>> index 9f926b86..75e62afd 100644
>> --- a/meta-ti-bsp/conf/machine/beagleplay.conf
>> +++ b/meta-ti-bsp/conf/machine/beagleplay.conf
>> @@ -2,6 +2,7 @@
>>   #@NAME: BeaglePlay (A53)
>>   #@DESCRIPTION: Machine configuration for the BeaglePlay board (A53 core)
>>   
>> +require conf/machine//include/beagle.inc
>>   require conf/machine/include/k3.inc
>>   SOC_FAMILY:append = ":am62xx"
>>   
>> @@ -24,7 +25,6 @@ UBOOT_MACHINE = "am62x_evm_a53_defconfig"
>>   # under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
>>   UBOOT_CONFIG_FRAGMENTS = "am625_beagleplay_a53.config"
>>   
>> -PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
>>   PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
>>   PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
>>   
>> diff --git a/meta-ti-bsp/conf/machine/include/beagle.inc b/meta-ti-bsp/conf/machine/include/beagle.inc
>> new file mode 100644
>> index 00000000..27e3298d
>> --- /dev/null
>> +++ b/meta-ti-bsp/conf/machine/include/beagle.inc
>> @@ -0,0 +1,3 @@
>> +
>> +PREFERRED_PROVIDER_virtual/kernel ?= "linux-bb.org"
>> +
>> -- 
>> 2.17.1
>>
>>
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>> View/Reply Online (#17525): https://lists.yoctoproject.org/g/meta-ti/message/17525
>> Mute This Topic: https://lists.yoctoproject.org/mt/104909031/6551054
>> Group Owner: meta-ti+owner@lists.yoctoproject.org
>> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [reatmon@ti.com]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>
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 d368fe1a..6fc7957c 100644
--- a/meta-ti-bsp/conf/machine/beagle-x15.conf
+++ b/meta-ti-bsp/conf/machine/beagle-x15.conf
@@ -2,10 +2,9 @@ 
 #@NAME: BeagleBoard X15
 #@DESCRIPTION: Machine configuration for the BeagleBoard X15
 
+require conf/machine/include/beagle.inc
 require conf/machine/include/am57xx.inc
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
-
 KERNEL_DEVICETREE_PREFIX = "am57xx-beagle-x15"
 
 KERNEL_DEVICETREE = " \
diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
index a19a3e29..8ec52bba 100644
--- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
+++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
@@ -2,6 +2,7 @@ 
 #@NAME: BeagleBone AI-64 (A72)
 #@DESCRIPTION: Machine configuration for the BeagleBone AI-64 board (A72 core)
 
+require conf/machine/include/beagle.inc
 require conf/machine/include/j721e.inc
 
 UBOOT_MACHINE = "j721e_evm_a72_config"
@@ -12,8 +13,6 @@  UBOOT_MACHINE = "j721e_evm_a72_config"
 # under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
 UBOOT_CONFIG_FRAGMENTS = "j721e_beagleboneai64_a72.config"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
-
 KERNEL_DEVICETREE = " \
 ti/k3-j721e-beagleboneai64.dtb \
 ti/k3-j721e-common-proc-board.dtb \
diff --git a/meta-ti-bsp/conf/machine/beaglebone.conf b/meta-ti-bsp/conf/machine/beaglebone.conf
index 7f78b297..8b8b9d29 100644
--- a/meta-ti-bsp/conf/machine/beaglebone.conf
+++ b/meta-ti-bsp/conf/machine/beaglebone.conf
@@ -2,10 +2,9 @@ 
 #@NAME: BeagleBone machine
 #@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board
 
+require conf/machine/include/beagle.inc
 require conf/machine/include/ti33x.inc
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
-
 KERNEL_DEVICETREE_PREFIX = "am335x-bone"
 
 KERNEL_DEVICETREE = " \
diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf
index 9f926b86..75e62afd 100644
--- a/meta-ti-bsp/conf/machine/beagleplay.conf
+++ b/meta-ti-bsp/conf/machine/beagleplay.conf
@@ -2,6 +2,7 @@ 
 #@NAME: BeaglePlay (A53)
 #@DESCRIPTION: Machine configuration for the BeaglePlay board (A53 core)
 
+require conf/machine//include/beagle.inc
 require conf/machine/include/k3.inc
 SOC_FAMILY:append = ":am62xx"
 
@@ -24,7 +25,6 @@  UBOOT_MACHINE = "am62x_evm_a53_defconfig"
 # under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
 UBOOT_CONFIG_FRAGMENTS = "am625_beagleplay_a53.config"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
 PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
 
diff --git a/meta-ti-bsp/conf/machine/include/beagle.inc b/meta-ti-bsp/conf/machine/include/beagle.inc
new file mode 100644
index 00000000..27e3298d
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/include/beagle.inc
@@ -0,0 +1,3 @@ 
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-bb.org"
+