summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-07-30 00:59:51 +0300
committerTom Rini <trini@konsulko.com>2019-07-30 00:59:51 +0300
commitde17e1fc03d97d420e9cb59f3a4d0f17c8bdcce5 (patch)
tree3b2d1e382ee75a3d2141d902395c9f3d5f49904e /Makefile
parent333755ef7b6f824366eed37ae068c20a4f25a123 (diff)
parent4f4fb85ec0bfe45da11aa23ada565387ee676e80 (diff)
downloadu-boot-de17e1fc03d97d420e9cb59f3a4d0f17c8bdcce5.tar.xz
Merge tag 'dm-pull-29jul19' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
binman support for replacing files
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index bff5a402a7..baa720ed1c 100644
--- a/Makefile
+++ b/Makefile
@@ -1189,9 +1189,10 @@ u-boot.ldr: u-boot
# ---------------------------------------------------------------------------
# Use 'make BINMAN_DEBUG=1' to enable debugging
quiet_cmd_binman = BINMAN $@
-cmd_binman = $(srctree)/tools/binman/binman build -u -d u-boot.dtb -O . -m \
+cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \
+ build -u -d u-boot.dtb -O . -m \
-I . -I $(srctree) -I $(srctree)/board/$(BOARDDIR) \
- $(if $(BINMAN_DEBUG),-D) $(BINMAN_$(@F))
+ $(BINMAN_$(@F))
OBJCOPYFLAGS_u-boot.ldr.hex := -I binary -O ihex