Re: [meta-ti][master/scarthgap][PATCH] conf: machine: Update UBOOT_MACHINE for am62xxsip-evm

[Denys Dmytriyenko <denis@denix.org>]

On Fri, Jun 14, 2024 at 12:31:23PM +0530, Chirag Shilwant via lists.yoctoproject.org wrote:
> Modify the U-Boot defconfig names for A53 and R5
> machine configurations based on ti-u-boot-2024.04 [1]
> 
> [1]: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/commit/?h=ti-u-boot-2024.04&id=df5181f8c6c41bf018ec043d565581b5d8a291c5

If we get the multi-BSP support merged, this would have to be adjusted to NOT 
break builds with 2023.04 U-boot...

Similar to beagleplay and beaglebone-ai64 changes here:
https://patchwork.yoctoproject.org/project/ti/patch/20240613172254.770920-3-denis@denix.org/


> Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
> ---
>  meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf | 7 +------
>  meta-ti-bsp/conf/machine/am62xxsip-evm.conf      | 2 +-
>  2 files changed, 2 insertions(+), 7 deletions(-)
> 
> diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
> index 0daff2b9..c35edc6e 100644
> --- a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
> +++ b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
> @@ -8,9 +8,4 @@ SYSFW_SOC = "am62x"
>  SYSFW_CONFIG = "evm"
>  SYSFW_SUFFIX = "hs-fs"
>  
> -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 = "am62xsip_sk_r5.config"
> +UBOOT_MACHINE = "am62xsip_evm_r5_defconfig"
> diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
> index b5dd18f1..38fe04c9 100644
> --- a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
> +++ b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
> @@ -13,4 +13,4 @@ KERNEL_DEVICETREE = " \
>      ti/k3-am625-sk.dtb \
>  "
>  
> -UBOOT_MACHINE = "am62x_evm_a53_defconfig"
> +UBOOT_MACHINE = "am62xsip_evm_a53_defconfig"
> -- 
> 2.34.1