commit e75c6493f629c22ca2382854c67da101c2f7d085
author Michal Simek <michal.simek@xilinx.com> Thu Apr 28 09:08:18 2016 +0200
committer Tom Rini <trini@konsulko.com> Mon May 02 18:37:11 2016 -0400
tree 15781cb5bfba79b2f569c222b4e3db7ef6664148
parent dbb2df12215bbacd973ce0740d0e1227c0410e4f

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>

scripts/Makefile.spl

diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
index 4424284..ec8d8f1 100644
--- a/scripts/Makefile.spl
+++ b/scripts/Makefile.spl
@@ -165,7 +165,7 @@
 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)