summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2020-08-07 09:44:11 -0600
committerTom Rini <trini@konsulko.com>2020-08-08 08:31:52 -0400
commitb904d79e4809bf35cf53c2e5fee0f73647bab07a (patch)
tree116c448ae52571ee6efa6e9c1cd57a2f5a625f4c
parent38ee01e4ddf7cca53fcf6585dd00373246b4df40 (diff)
downloadu-boot-b904d79e4809bf35cf53c2e5fee0f73647bab07a.tar.gz
Makefile: sunxi: Don't use binman to build ATF image
At present with sunxi 64-bit, the Makefile builds u-boot-sunxi-with-spl.bin and then binman overwrites it with its own version. But the binman definition lacks some parts, in particular BL31. For now, work around this with a hack. Tested-by: Andre Przywara <andre.przywara@arm.com> Tested-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: Simon Glass <sjg@chromium.org> Fixes: 42b18df80fd ("x86: Makefile: Drop explicit targets built by binman")
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 2629a741f1..4483a9bc8a 100644
--- a/Makefile
+++ b/Makefile
@@ -1024,9 +1024,13 @@ PHONY += inputs
inputs: $(INPUTS-y)
all: .binman_stamp inputs
+ # Hack for sunxi which doesn't have a proper binman definition for
+ # 64-bit boards
+ifneq ($(CONFIG_ARCH_SUNXI)$(CONFIG_ARM64),yy)
ifeq ($(CONFIG_BINMAN),y)
$(call if_changed,binman)
endif
+endif
# Timestamp file to make sure that binman always runs
.binman_stamp: FORCE