diff options
| author | York Sun <yorksun@freescale.com> | 2013-08-21 09:03:29 -0700 |
|---|---|---|
| committer | York Sun <yorksun@freescale.com> | 2013-08-21 09:03:29 -0700 |
| commit | b6df9b01fb8c126b212aba92b6523407d3fa60a5 (patch) | |
| tree | e49616e5776f16e8d696d9663185908c8078c6a4 | |
| parent | e6394e9e8f83b77b61f0b240fcd39622571be690 (diff) | |
| download | u-boot-imx-b6df9b01fb8c126b212aba92b6523407d3fa60a5.zip u-boot-imx-b6df9b01fb8c126b212aba92b6523407d3fa60a5.tar.gz u-boot-imx-b6df9b01fb8c126b212aba92b6523407d3fa60a5.tar.bz2 | |
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>
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -482,7 +482,7 @@ $(obj)u-boot.dis: $(obj)u-boot SPL_PAD_APPEND = \ $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(4) -I binary -O binary \ $(1) $(obj)$(3); \ - cat $(obj)$(3) $(obj)$(2) > $@; \ + cat $(obj)$(3) $(2) > $@; \ rm $(obj)$(3) ifdef CONFIG_TPL @@ -495,7 +495,7 @@ $(obj)u-boot-with-spl.bin: $(obj)spl/u-boot-spl.bin $(SPL_PAYLOAD) $(call SPL_PAD_APPEND,$<,$(SPL_PAYLOAD),spl/u-boot-spl-pad.bin,$(CONFIG_SPL_PAD_TO)) $(obj)tpl/u-boot-with-tpl.bin: $(obj)tpl/u-boot-tpl.bin $(obj)u-boot.bin - $(call SPL_PAD_APPEND,$<,u-boot.bin,tpl/u-boot-tpl-pad.bin,$(CONFIG_TPL_PAD_TO)) + $(call SPL_PAD_APPEND,$<,$(obj)u-boot.bin,tpl/u-boot-tpl-pad.bin,$(CONFIG_TPL_PAD_TO)) $(obj)u-boot-with-spl.imx: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin $(MAKE) -C $(SRCTREE)/arch/arm/imx-common \ |