diff mbox series

[v3,6/8] rockchip: simplify binman image dependencies addition to INPUTS

Message ID 20220801160610.2330151-7-foss+uboot@0leil.net
State Superseded
Delegated to: Kever Yang
Headers show
Series migrate u-boot-rockchip.bin to binman and generate an image for SPI | expand

Commit Message

Quentin Schulz Aug. 1, 2022, 4:06 p.m. UTC 
From: Quentin Schulz <quentin.schulz@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@0leil.net>
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
---
 Makefile | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

Comments

Quentin Schulz Aug. 1, 2022, 4:24 p.m. UTC | #1 
HI all,

On 8/1/22 18:06, Quentin Schulz wrote:
> From: Quentin Schulz <quentin.schulz@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@0leil.net>
> Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
> ---
>   Makefile | 9 ++-------
>   1 file changed, 2 insertions(+), 7 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index f8e919e136..640d4b8f65 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -995,19 +995,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

This one should be moved....

>   else
> -ifeq ($(CONFIG_SPL),y)
> -# Generate these inputs for binman which will create the output files
>   INPUTS-y += u-boot.img
>   endif

....down here to keep the same behavior. Will update for v4.

Cheers,
Quentin
diff mbox series

Patch

diff --git a/Makefile b/Makefile
index f8e919e136..640d4b8f65 100644
--- a/Makefile
+++ b/Makefile
@@ -995,19 +995,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) \