Commit b6df9b01fb8c126b212aba92b6523407d3fa60a5
1 parent
e6394e9e8f
Exists in
master
and in
53 other branches
Makefile: Fix build in a separated directory tree
Fix a bug introduced by commit 3aa29dee TPL : introduce the TPL based on the SPL Signed-off-by: York Sun <yorksun@freescale.com>
Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff
Makefile
| ... | ... | @@ -482,7 +482,7 @@ |
| 482 | 482 | SPL_PAD_APPEND = \ |
| 483 | 483 | $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(4) -I binary -O binary \ |
| 484 | 484 | $(1) $(obj)$(3); \ |
| 485 | - cat $(obj)$(3) $(obj)$(2) > $@; \ | |
| 485 | + cat $(obj)$(3) $(2) > $@; \ | |
| 486 | 486 | rm $(obj)$(3) |
| 487 | 487 | |
| 488 | 488 | ifdef CONFIG_TPL |
| ... | ... | @@ -495,7 +495,7 @@ |
| 495 | 495 | $(call SPL_PAD_APPEND,$<,$(SPL_PAYLOAD),spl/u-boot-spl-pad.bin,$(CONFIG_SPL_PAD_TO)) |
| 496 | 496 | |
| 497 | 497 | $(obj)tpl/u-boot-with-tpl.bin: $(obj)tpl/u-boot-tpl.bin $(obj)u-boot.bin |
| 498 | - $(call SPL_PAD_APPEND,$<,u-boot.bin,tpl/u-boot-tpl-pad.bin,$(CONFIG_TPL_PAD_TO)) | |
| 498 | + $(call SPL_PAD_APPEND,$<,$(obj)u-boot.bin,tpl/u-boot-tpl-pad.bin,$(CONFIG_TPL_PAD_TO)) | |
| 499 | 499 | |
| 500 | 500 | $(obj)u-boot-with-spl.imx: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin |
| 501 | 501 | $(MAKE) -C $(SRCTREE)/arch/arm/imx-common \ |