[U-Boot] [PATCH v2] 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 ---
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)
2016-04-28 16:08 GMT+09:00 Michal Simek michal.simek@xilinx.com:
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
On 28 April 2016 at 01:08, Michal Simek michal.simek@xilinx.com wrote:
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
Changes in v2:
- Refactor based on Masahiro comments
scripts/Makefile.spl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Simon Glass sjg@chromium.org
On Thu, Apr 28, 2016 at 09:08:18AM +0200, Michal Simek wrote:
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
Applied to u-boot/master, thanks!
participants (4)
-
Masahiro Yamada -
Michal Simek -
Simon Glass -
Tom Rini