diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-04-09 20:10:43 +0900 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-04-11 10:08:42 -0400 |
| commit | 395e60cdc292dc0183c6867d34b43f14a373df55 (patch) | |
| tree | 9812385a67c59263cbe9d248129cf28429f344e8 | |
| parent | 519fdde9e6a6ebce7dc743b4f5621503d25b7a45 (diff) | |
| download | u-boot-imx-395e60cdc292dc0183c6867d34b43f14a373df55.zip u-boot-imx-395e60cdc292dc0183c6867d34b43f14a373df55.tar.gz u-boot-imx-395e60cdc292dc0183c6867d34b43f14a373df55.tar.bz2 | |
kbuild: fix a bug in regeneration of linker scripts
In some use cases, SPL linker script was not updated even when
it should be.
For instance,
$ make tricoder_config all
[ build complete ]
... modify include/configs/tricoder.h
$ make
spl/u-boot-spl.lds should be updated in this case, but it wasn't.
To fix this problem, linker scripts generation should be handled
by $(call if_changed_dep,...) rather than by $(call if_changed,...).
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Reported-by: Andreas Bießmann <andreas.devel@googlemail.com>
Tested-by: Andreas Bießmann <andreas.devel@googlemail.com>
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | spl/Makefile | 6 |
2 files changed, 6 insertions, 6 deletions
@@ -1053,11 +1053,11 @@ depend dep: # --------------------------------------------------------------------------- quiet_cmd_cpp_lds = LDS $@ -cmd_cpp_lds = $(CPP) $(cpp_flags) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ \ - -x assembler-with-cpp -P -o $@ $< +cmd_cpp_lds = $(CPP) -Wp,-MD,$(depfile) $(cpp_flags) $(LDPPFLAGS) -ansi \ + -D__ASSEMBLY__ -x assembler-with-cpp -P -o $@ $< u-boot.lds: $(LDSCRIPT) prepare FORCE - $(call if_changed,cpp_lds) + $(call if_changed_dep,cpp_lds) PHONY += nand_spl nand_spl: prepare diff --git a/spl/Makefile b/spl/Makefile index 9f5dbf4..6fec252 100644 --- a/spl/Makefile +++ b/spl/Makefile @@ -231,11 +231,11 @@ $(u-boot-spl-dirs): $(Q)$(MAKE) $(build)=$@ quiet_cmd_cpp_lds = LDS $@ -cmd_cpp_lds = $(CPP) $(cpp_flags) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ \ - -x assembler-with-cpp -P -o $@ $< +cmd_cpp_lds = $(CPP) -Wp,-MD,$(depfile) $(cpp_flags) $(LDPPFLAGS) -ansi \ + -D__ASSEMBLY__ -x assembler-with-cpp -P -o $@ $< $(obj)/u-boot-spl.lds: $(LDSCRIPT) FORCE - $(call if_changed,cpp_lds) + $(call if_changed_dep,cpp_lds) # read all saved command lines |