diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-04-21 11:33:07 +0900 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-04-23 08:44:42 -0400 |
| commit | 794d5f55407080aaf5dd7585a98cefe9c6f9a569 (patch) | |
| tree | 076040b935a880a69c652d2942e0deb057003f67 /Makefile | |
| parent | b149c4c399b111cec1ff7505ca9fabbeeb4fe394 (diff) | |
| download | talos-obmc-uboot-794d5f55407080aaf5dd7585a98cefe9c6f9a569.tar.gz talos-obmc-uboot-794d5f55407080aaf5dd7585a98cefe9c6f9a569.zip | |
Revert "build: Use filechk rules to create and update u-boot.lds"
This reverts commit a8b993eb81c142a439c24b871a2317f765fe5397.
Commit a8b993eb claims it fixes u-boot.lds rule by replacing
$(call if_changed) with $(call filechk).
But the problem had already been fixed by commit 395e60cd
a few days before commit a8b993eb was posted.
There is no reason to apply commit a8b993eb. What is worse is
$(call filechk) is too strong to fix the problem and looks weird.
Date of the two patches:
[1] commit 395e60cdc292dc0183c6867d34b43f14a373df55
Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
AuthorDate: Wed Apr 9 20:10:43 2014 +0900
Commit: Tom Rini <trini@ti.com>
CommitDate: Fri Apr 11 10:08:42 2014 -0400
replaces $(call if_changed) -> $(call if_changed_dep)
[2] commit a8b993eb81c142a439c24b871a2317f765fe5397
Author: Jon Loeliger <jon.loeliger@oracle.com>
AuthorDate: Tue Apr 15 16:09:37 2014 -0500
Commit: Tom Rini <trini@ti.com>
CommitDate: Fri Apr 18 16:14:16 2014 -0400
replaces $(call if_changed) -> $(call filechk)
A conflict must have happened when applying [2], but somehow it was
applied, sadly.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Jon Loeliger <jon.loeliger@oracle.com>
Cc: Andreas Bießmann <andreas.devel@googlemail.com>
Cc: Tom Rini <trini@ti.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -1093,13 +1093,12 @@ depend dep: @echo '*** Warning: make $@ is unnecessary now.' # --------------------------------------------------------------------------- -define filechk_ubootlds - ($(CPP) -Wp,-MD,$(depfile) $(cpp_flags) $(LDPPFLAGS) -ansi \ - -D__ASSEMBLY__ -x assembler-with-cpp -P -o - -) -endef +quiet_cmd_cpp_lds = LDS $@ +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 filechk,ubootlds) + $(call if_changed_dep,cpp_lds) PHONY += nand_spl nand_spl: prepare |
