[meta-ti][master/scarthgap][PATCH] conf: machine: Switch beagleplay to TI baseline by default

[meta-ti][master/scarthgap][PATCH] conf: machine: Switch beagleplay to TI baseline by default

[Chirag Shilwant]

- From LTS scarthgap, the beagleplay yocto machine will by
default build with TI baseline (i.e kernel 6.6 & U-Boot 2024.04 as of today).
Hence, remove all the references of bb.org from machine configuration file.

- Users can still build with Beagle's baseline (i.e. linux-bb.org & u-boot-bb.org)
by adding the following in their local.conf,

```
   PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
   PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
   PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
```

Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
---
 meta-ti-bsp/conf/machine/beagleplay-k3r5.conf | 10 +---------
 meta-ti-bsp/conf/machine/beagleplay.conf      | 12 +++---------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
index 601cbbf7..b597c702 100644
--- a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
@@ -4,16 +4,8 @@
 
 require conf/machine/include/k3r5.inc
 
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
-PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
-
 SYSFW_SOC = "am62x"
 SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "gp"
 
-UBOOT_MACHINE = "am62x_evm_r5_defconfig"
-
-# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build
-# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc
-# under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
-UBOOT_CONFIG_FRAGMENTS = "am625_beagleplay_r5.config"
+UBOOT_MACHINE = "am62x_beagleplay_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf
index 65c14333..1420d439 100644
--- a/meta-ti-bsp/conf/machine/beagleplay.conf
+++ b/meta-ti-bsp/conf/machine/beagleplay.conf
@@ -2,7 +2,6 @@
 #@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"
 
@@ -18,15 +17,10 @@ TFA_K3_SYSTEM_SUSPEND = "1"
 
 OPTEEMACHINE = "k3-am62x"
 
-UBOOT_MACHINE = "am62x_evm_a53_defconfig"
+SPL_BINARY = "tispl.bin_unsigned"
+SPL_BINARYNAME = "tispl.bin"
 
-# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build
-# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc
-# under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
-UBOOT_CONFIG_FRAGMENTS = "am625_beagleplay_a53.config"
-
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
-PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
+UBOOT_MACHINE = "am62x_beagleplay_a53_defconfig"
 
 KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-am625 \
-- 
2.34.1

Re: [meta-ti][master/scarthgap][PATCH] conf: machine: Switch beagleplay to TI baseline by default

[Dhruva Gole]

Hi,

On Jun 06, 2024 at 11:35:55 +0530, Chirag Shilwant wrote:
> - From LTS scarthgap, the beagleplay yocto machine will by
> default build with TI baseline (i.e kernel 6.6 & U-Boot 2024.04 as of today).
> Hence, remove all the references of bb.org from machine configuration file.
> 
> - Users can still build with Beagle's baseline (i.e. linux-bb.org & u-boot-bb.org)
> by adding the following in their local.conf,
> 
> ```
>    PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
>    PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
>    PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
> ```
> 
> Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
> ---
>  meta-ti-bsp/conf/machine/beagleplay-k3r5.conf | 10 +---------
>  meta-ti-bsp/conf/machine/beagleplay.conf      | 12 +++---------
>  2 files changed, 4 insertions(+), 18 deletions(-)
> 
> diff --git a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
> index 601cbbf7..b597c702 100644
> --- a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
> +++ b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
> @@ -4,16 +4,8 @@
>  
>  require conf/machine/include/k3r5.inc
>  
> -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
> -PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
> -
>  SYSFW_SOC = "am62x"
>  SYSFW_CONFIG = "evm"
>  SYSFW_SUFFIX = "gp"
>  
> -UBOOT_MACHINE = "am62x_evm_r5_defconfig"
> -
> -# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build
> -# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc
> -# under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
> -UBOOT_CONFIG_FRAGMENTS = "am625_beagleplay_r5.config"
> +UBOOT_MACHINE = "am62x_beagleplay_r5_defconfig"
> diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf
> index 65c14333..1420d439 100644
> --- a/meta-ti-bsp/conf/machine/beagleplay.conf
> +++ b/meta-ti-bsp/conf/machine/beagleplay.conf
> @@ -2,7 +2,6 @@
>  #@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"
>  
> @@ -18,15 +17,10 @@ TFA_K3_SYSTEM_SUSPEND = "1"
>  
>  OPTEEMACHINE = "k3-am62x"
>  
> -UBOOT_MACHINE = "am62x_evm_a53_defconfig"
> +SPL_BINARY = "tispl.bin_unsigned"
> +SPL_BINARYNAME = "tispl.bin"
>  
> -# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build
> -# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc
> -# under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
> -UBOOT_CONFIG_FRAGMENTS = "am625_beagleplay_a53.config"
> -
> -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
> -PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
> +UBOOT_MACHINE = "am62x_beagleplay_a53_defconfig"

I agree with the idea here that we'd rather move to using the ti linux
and uboots for the yocto beagleplay images that we're going to be coming
out with. The debian offering that Beagleboard does is going to be based
off of the beagle trees and is independent of these changes anyway.

So the users that do use yocto still have the flexibility to use bb
trees as mentioned in the commit message, and I do hope it is also well
documented somewhere. But by default it makes sense to roll out ti
baseline yocto images for beagleplay.

Reviewed-by: Dhruva Gole <d-gole@ti.com>

-- 
Best regards,
Dhruva

Re: [meta-ti][master/scarthgap][PATCH] conf: machine: Switch beagleplay to TI baseline by default

[Denys Dmytriyenko]

On Thu, Jun 06, 2024 at 11:35:55AM +0530, Chirag Shilwant wrote:
> - From LTS scarthgap, the beagleplay yocto machine will by
> default build with TI baseline (i.e kernel 6.6 & U-Boot 2024.04 as of today).
> Hence, remove all the references of bb.org from machine configuration file.
> 
> - Users can still build with Beagle's baseline (i.e. linux-bb.org & u-boot-bb.org)
> by adding the following in their local.conf,
> 
> ```
>    PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
>    PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
>    PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
> ```

This won't work as expected, as it can be seen in the code that defconfigs are 
different and there are other differences between 6.1 and 6.6 LTSs...


> Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
> ---
>  meta-ti-bsp/conf/machine/beagleplay-k3r5.conf | 10 +---------
>  meta-ti-bsp/conf/machine/beagleplay.conf      | 12 +++---------
>  2 files changed, 4 insertions(+), 18 deletions(-)
> 
> diff --git a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
> index 601cbbf7..b597c702 100644
> --- a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
> +++ b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
> @@ -4,16 +4,8 @@
>  
>  require conf/machine/include/k3r5.inc
>  
> -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
> -PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
> -
>  SYSFW_SOC = "am62x"
>  SYSFW_CONFIG = "evm"
>  SYSFW_SUFFIX = "gp"
>  
> -UBOOT_MACHINE = "am62x_evm_r5_defconfig"
> -
> -# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build
> -# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc
> -# under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
> -UBOOT_CONFIG_FRAGMENTS = "am625_beagleplay_r5.config"
> +UBOOT_MACHINE = "am62x_beagleplay_r5_defconfig"
> diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf
> index 65c14333..1420d439 100644
> --- a/meta-ti-bsp/conf/machine/beagleplay.conf
> +++ b/meta-ti-bsp/conf/machine/beagleplay.conf
> @@ -2,7 +2,6 @@
>  #@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"
>  
> @@ -18,15 +17,10 @@ TFA_K3_SYSTEM_SUSPEND = "1"
>  
>  OPTEEMACHINE = "k3-am62x"
>  
> -UBOOT_MACHINE = "am62x_evm_a53_defconfig"
> +SPL_BINARY = "tispl.bin_unsigned"
> +SPL_BINARYNAME = "tispl.bin"
>  
> -# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build
> -# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc
> -# under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
> -UBOOT_CONFIG_FRAGMENTS = "am625_beagleplay_a53.config"
> -
> -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
> -PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
> +UBOOT_MACHINE = "am62x_beagleplay_a53_defconfig"
>  
>  KERNEL_DEVICETREE_PREFIX = " \
>      ti/k3-am625 \
> -- 
> 2.34.1
> 

Re: [meta-ti][master/scarthgap][PATCH] conf: machine: Switch beagleplay to TI baseline by default

[Chirag Shilwant]

Hi Denys,

On 08/06/24 01:45, Denys Dmytriyenko wrote:
> On Thu, Jun 06, 2024 at 11:35:55AM +0530, Chirag Shilwant wrote:
>> - From LTS scarthgap, the beagleplay yocto machine will by
>> default build with TI baseline (i.e kernel 6.6 & U-Boot 2024.04 as of today).
>> Hence, remove all the references of bb.org from machine configuration file.
>>
>> - Users can still build with Beagle's baseline (i.e. linux-bb.org & u-boot-bb.org)
>> by adding the following in their local.conf,
>>
>> ```
>>     PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
>>     PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
>>     PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
>> ```
> This won't work as expected, as it can be seen in the code that defconfigs are
> different


Yeah, an update is needed in u-boot-bb.org to incorporate the defconfig 
name as per U-Boot 2023.04
Hence, commented the same on your linux-bb.org re-org patch [1] :)

[1]: https://lists.yoctoproject.org/g/meta-ti/message/17714




>   and there are other differences between 6.1 and 6.6 LTSs...


Can you help me understand on what are the differences in 6.1 v/s 6.6 
LTS for beagleplay
other than kernel device tree? As [2] already handles the device tree 
differences

[2]: https://lists.yoctoproject.org/g/meta-ti/message/17707


>
>
>> Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
>> ---
>>   meta-ti-bsp/conf/machine/beagleplay-k3r5.conf | 10 +---------
>>   meta-ti-bsp/conf/machine/beagleplay.conf      | 12 +++---------
>>   2 files changed, 4 insertions(+), 18 deletions(-)
>>
>> diff --git a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
>> index 601cbbf7..b597c702 100644
>> --- a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
>> +++ b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
>> @@ -4,16 +4,8 @@
>>   
>>   require conf/machine/include/k3r5.inc
>>   
>> -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
>> -PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
>> -
>>   SYSFW_SOC = "am62x"
>>   SYSFW_CONFIG = "evm"
>>   SYSFW_SUFFIX = "gp"
>>   
>> -UBOOT_MACHINE = "am62x_evm_r5_defconfig"
>> -
>> -# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build
>> -# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc
>> -# under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
>> -UBOOT_CONFIG_FRAGMENTS = "am625_beagleplay_r5.config"
>> +UBOOT_MACHINE = "am62x_beagleplay_r5_defconfig"
>> diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf
>> index 65c14333..1420d439 100644
>> --- a/meta-ti-bsp/conf/machine/beagleplay.conf
>> +++ b/meta-ti-bsp/conf/machine/beagleplay.conf
>> @@ -2,7 +2,6 @@
>>   #@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"
>>   
>> @@ -18,15 +17,10 @@ TFA_K3_SYSTEM_SUSPEND = "1"
>>   
>>   OPTEEMACHINE = "k3-am62x"
>>   
>> -UBOOT_MACHINE = "am62x_evm_a53_defconfig"
>> +SPL_BINARY = "tispl.bin_unsigned"
>> +SPL_BINARYNAME = "tispl.bin"
>>   
>> -# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build
>> -# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc
>> -# under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
>> -UBOOT_CONFIG_FRAGMENTS = "am625_beagleplay_a53.config"
>> -
>> -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
>> -PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
>> +UBOOT_MACHINE = "am62x_beagleplay_a53_defconfig"
>>   
>>   KERNEL_DEVICETREE_PREFIX = " \
>>       ti/k3-am625 \
>> -- 
>> 2.34.1
>>