summaryrefslogtreecommitdiffstats
path: root/scripts/Makefile.spl
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2016-04-28 09:08:18 +0200
committerTom Rini <trini@konsulko.com>2016-05-02 18:37:11 -0400
commitfd2d1e0d47d585eac936a7239eb2bdad7e07a8cc (patch)
tree15781cb5bfba79b2f569c222b4e3db7ef6664148 /scripts/Makefile.spl
parent4c1dc1a90fb60c2e5f28351b6ff2ae187dc587ef (diff)
downloadblackbird-obmc-uboot-fd2d1e0d47d585eac936a7239eb2bdad7e07a8cc.tar.gz
blackbird-obmc-uboot-fd2d1e0d47d585eac936a7239eb2bdad7e07a8cc.zip
kbuild: Do not append dtb for OF_EMBED case
dtb is already included in binary that's why there is no need to replace u-boot-spl.bin with u-boot-spl-dtb.bin. This is only needed for OF_SEPARATE is enabled. Only copy -nodtb.bin version which is straight output from objcopy -O binary. Signed-off-by: Michal Simek <michal.simek@xilinx.com> Reviewed-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'scripts/Makefile.spl')
-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)
OpenPOWER on IntegriCloud