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

Michal Simek michal.simek at xilinx.com
Wed Apr 27 14:28:31 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>
---

 scripts/Makefile.spl | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
index 44242842db31..79c680c1d62f 100644
--- a/scripts/Makefile.spl
+++ b/scripts/Makefile.spl
@@ -170,12 +170,17 @@ $(obj)/$(SPL_BIN)-dtb.bin: $(obj)/$(SPL_BIN)-nodtb.bin $(obj)/$(SPL_BIN)-pad.bin
 		$(obj)/$(SPL_BIN).dtb FORCE
 	$(call if_changed,cat)
 
+ifeq ($(CONFIG_OF_SEPARATE),y)
 $(obj)/$(SPL_BIN).bin: $(obj)/$(SPL_BIN)-dtb.bin FORCE
 	$(call if_changed,copy)
 else
 $(obj)/$(SPL_BIN).bin: $(obj)/$(SPL_BIN)-nodtb.bin FORCE
 	$(call if_changed,copy)
 endif
+else
+$(obj)/$(SPL_BIN).bin: $(obj)/$(SPL_BIN)-nodtb.bin FORCE
+	$(call if_changed,copy)
+endif
 
 # Create a file that pads from the end of u-boot-spl-nodtb.bin to bss_end
 $(obj)/$(SPL_BIN)-pad.bin: $(obj)/$(SPL_BIN)
-- 
1.9.1



More information about the U-Boot mailing list