[U-Boot] [PATCH v2] kbuild: Do not append dtb for OF_EMBED case

Michal Simek michal.simek at xilinx.com
Thu Apr 28 09:08:18 CEST 2016


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 at xilinx.com>
---

Changes in v2:
- Refactor based on Masahiro comments

 scripts/Makefile.spl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
index 33f1a3f3939c..5df860e7ed11 100644
--- a/scripts/Makefile.spl
+++ b/scripts/Makefile.spl
@@ -174,7 +174,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)
-- 
1.9.1



More information about the U-Boot mailing list