[PATCH v5 6/8] rockchip: simplify binman image dependencies addition to INPUTS

[Simon Glass]

On Fri, 26 Aug 2022 at 09:37, Quentin Schulz <foss+uboot at 0leil.net> wrote:
>
> From: Quentin Schulz <quentin.schulz at theobroma-systems.com>
>
> By factoring SPL check in the first condition, this makes the checks a
> bit less convoluted and more readable.
>
> Cc: Quentin Schulz <foss+uboot at 0leil.net>
> Signed-off-by: Quentin Schulz <quentin.schulz at theobroma-systems.com>
> ---
>
> v4:
>  - fixed wrong place for endif for ARM32 boards,
>
>  Makefile | 9 ++-------
>  1 file changed, 2 insertions(+), 7 deletions(-)

Reviewed-by: Simon Glass <sjg at chromium.org>


>
> diff --git a/Makefile b/Makefile
> index 1dee09eb36..736c4ad182 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1001,19 +1001,14 @@ ifeq ($(CONFIG_MPC85xx)$(CONFIG_OF_SEPARATE),yy)
>  INPUTS-y += u-boot-with-dtb.bin
>  endif
>
> -ifeq ($(CONFIG_ARCH_ROCKCHIP),y)
> -# On ARM64 this target is produced by binman so we don't need this dep
> +ifeq ($(CONFIG_ARCH_ROCKCHIP)$(CONFIG_SPL),yy)
> +# Binman image dependencies
>  ifeq ($(CONFIG_ARM64),y)
> -ifeq ($(CONFIG_SPL),y)
>  INPUTS-y += u-boot.itb
> -endif
>  else
> -ifeq ($(CONFIG_SPL),y)
> -# Generate these inputs for binman which will create the output files
>  INPUTS-y += u-boot.img
>  endif
>  endif
> -endif
>
>  INPUTS-$(CONFIG_X86) += u-boot-x86-start16.bin u-boot-x86-reset16.bin \
>         $(if $(CONFIG_SPL_X86_16BIT_INIT),spl/u-boot-spl.bin) \
> --
> 2.37.2
>