summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorQuentin Schulz <quentin.schulz@theobroma-systems.com>2022-09-02 15:10:53 +0200
committerKever Yang <kever.yang@rock-chips.com>2022-09-04 20:00:39 +0800
commita6e569fac3cb44bcb58b3c41b3126f5d8d7b8ba1 (patch)
tree7358870267d5bb81ac6a9883488e9e0dce661581 /Makefile
parent05713d570762d7cb9049e720860e8e745d92f1ef (diff)
downloadu-boot-socfpga-a6e569fac3cb44bcb58b3c41b3126f5d8d7b8ba1.tar.gz
rockchip: simplify binman image dependencies addition to INPUTS
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> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 2 insertions, 7 deletions
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) \