Re: [meta-ti] [master/kirkstone][PATCH] machine:k3r5:Handle UBOOT_CONFIG for multiple R5 defconfigs

[Denys Dmytriyenko <denis@denix.org>]

The prefix in the Subject indicates the area being changed, so should 
rather be u-boot: instead of machine:k3r5:


On Mon, Oct 02, 2023 at 02:16:16PM -0700, Garrett Giordano wrote:
> From: Garrett Giordano <ggiordano@phytec.com>
> 
> Currently the do_compile step fails if we try to implement UBOOT_CONFIG
> in an attempt to build U-Boot with multiple R5 defconfigs.
> 
> This commit adds a condition to handle linking the UBOOT_BINARY if
> UBOOT_CONFIG is used in place of UBOOT_MACHINE.

Are you sure you don't need any corresponding changes in do_install 
and do_deploy to handle UBOOT_CONFIG for k3r5? Have you tested that 
all binaries and symlinks are being installed and deployed properly 
from ${B}/${config} location?

And I've already mentioned this before, but UBOOT_CONFIG won't work 
with recently introduced UBOOT_CONFIG_FRAGMENTS - see the list from 
last month for previous discussions on this, e.g.:
https://lists.yoctoproject.org/g/meta-ti/topic/101245468

At least UBOOT_CONFIG_FRAGMENTS will still work if UBOOT_CONFIG is 
not set, due to the else condition below.


> Signed-off-by: Garrett Giordano <ggiordano@phytec.com>
> ---
>  meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 22 ++++++++++++++++++--
>  1 file changed, 20 insertions(+), 2 deletions(-)
> 
> diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
> index 2c4ddcc2..327a31d8 100644
> --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
> +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
> @@ -103,8 +103,26 @@ UBOOT_HS_2ND_IMAGE = "u-boot-spl_HS_2ND-${MACHINE}-${PV}-${PR}"
>  UBOOT_HS_2ND_SYMLINK = "u-boot-spl_HS_2ND-${MACHINE}"
>  
>  do_compile:append:k3r5 () {
> -	if ! [ -f ${B}/${UBOOT_BINARY} ]; then
> -		ln -s spl/u-boot-spl.${UBOOT_SUFFIX} ${B}/${UBOOT_BINARY}
> +	if [ -n "${UBOOT_CONFIG}" ];
> +	then
> +		for config in ${UBOOT_MACHINE}; do
> +			i=$(expr $i + 1);
> +			for type in ${UBOOT_CONFIG}; do
> +				j=$(expr $j + 1);
> +				if [ $j -eq $i ];
> +				then
> +					if ! [ -L ${B}/${config}/${UBOOT_BINARY} ] && ! [ -f ${B}/${config}/${UBOOT_BINARY} ]; then
> +						ln -s ${B}/${config}/spl/u-boot-spl.${UBOOT_SUFFIX} ${B}/${config}/${UBOOT_BINARY}
> +					fi
> +				fi
> +			done
> +			unset  j
> +		done
> +		unset  i
> +	else
> +		if ! [ -f ${B}/${UBOOT_BINARY} ]; then
> +			ln -s spl/u-boot-spl.${UBOOT_SUFFIX} ${B}/${UBOOT_BINARY}
> +		fi
>  	fi
>  }
>  
> -- 
> 2.25.1