summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorStefano Babic <sbabic@denx.de>2016-05-17 17:51:44 +0200
committerStefano Babic <sbabic@denx.de>2016-05-17 17:51:44 +0200
commit52b1eaf93d6b55e1467f97b8eefdc2f8b6031c43 (patch)
tree73357539a8382b406c29b1826dc17012f267f2cb /scripts
parentaaeadd3f7b248aeb1c72c36183ab9c6e77da6ce2 (diff)
parentaeaec0e682f45b9e0c62c522fafea353931f73ed (diff)
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.spl2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
index 44242842db..ec8d8f1b72 100644
--- a/scripts/Makefile.spl
+++ b/scripts/Makefile.spl
@@ -165,7 +165,7 @@ cmd_cat = cat $(filter-out $(PHONY), $^) > $@
quiet_cmd_copy = COPY $@
cmd_copy = cp $< $@
-ifeq ($(CONFIG_SPL_OF_CONTROL),y)
+ifeq ($(CONFIG_SPL_OF_CONTROL)$(CONFIG_OF_SEPARATE),yy)
$(obj)/$(SPL_BIN)-dtb.bin: $(obj)/$(SPL_BIN)-nodtb.bin $(obj)/$(SPL_BIN)-pad.bin \
$(obj)/$(SPL_BIN).dtb FORCE
$(call if_changed,cat)