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

[Denys Dmytriyenko <denis@denix.org>]

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
>