Re: [OE-core] [PATCH V3 1/3] u-boot: support merging .cfg files for UBOOT_CONFIG

["Denys Dmytriyenko" <denis@denix.org>]

Is this change really required for UBOOT_INITIAL_ENV? I think you are merging 
several patch series together?


On Thu, May 28, 2020 at 02:41:27PM +0200, Ming Liu wrote:
> From: Ming Liu <ming.liu@toradex.com>
> 
> U-boot recipe supports .cfg files in SRC_URI, but they would be merged
> to .config during do_configure only when UBOOT_MACHINE is set, we
> should also support merging .cfg files for UBOOT_CONFIG.
> 
> Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
> Signed-off-by: Ming Liu <ming.liu@toradex.com>
> ---
>  meta/recipes-bsp/u-boot/u-boot.inc | 21 +++++++++++++++++----
>  1 file changed, 17 insertions(+), 4 deletions(-)
> 
> diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
> index 80f828df52..8cfd25020c 100644
> --- a/meta/recipes-bsp/u-boot/u-boot.inc
> +++ b/meta/recipes-bsp/u-boot/u-boot.inc
> @@ -77,7 +77,23 @@ def find_cfgs(d):
>      return sources_list
>  
>  do_configure () {
> -    if [ -z "${UBOOT_CONFIG}" ]; then
> +    if [ -n "${UBOOT_CONFIG}" ]; then
> +        unset i j
> +        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
> +                    oe_runmake -C ${S} O=${B}/${config} ${config}
> +                    merge_config.sh -m -O ${B}/${config} ${B}/${config}/.config ${@" ".join(find_cfgs(d))}
> +                    oe_runmake -C ${S} O=${B}/${config} oldconfig
> +                fi
> +            done
> +            unset j
> +        done
> +        unset i
> +        DEVTOOL_DISABLE_MENUCONFIG=true
> +    else
>          if [ -n "${UBOOT_MACHINE}" ]; then
>              oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE}
>          else
> @@ -85,8 +101,6 @@ do_configure () {
>          fi
>          merge_config.sh -m .config ${@" ".join(find_cfgs(d))}
>          cml1_do_configure
> -    else
> -        DEVTOOL_DISABLE_MENUCONFIG=true
>      fi
>  }
>  
> @@ -114,7 +128,6 @@ do_compile () {
>                  j=$(expr $j + 1);
>                  if [ $j -eq $i ]
>                  then
> -                    oe_runmake -C ${S} O=${B}/${config} ${config}
>                      oe_runmake -C ${S} O=${B}/${config} ${UBOOT_MAKE_TARGET}
>                      for binary in ${UBOOT_BINARIES}; do
>                          k=$(expr $k + 1);
> -- 
> 2.26.2
> 

>