Revert "build: Use filechk rules to create and update u-boot.lds"
PATCH 1/1 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 <[email protected]>
AuthorDate: Wed Apr 9 20:10:43 2014 +0900
Commit: Tom Rini <[email protected]>
CommitDate: Fri Apr 11 10:08:42 2014 -0400
replaces $(call if_changed) -> $(call if_changed_dep)
[2] commit a8b993eb81c142a439c24b871a2317f765fe5397
Author: Jon Loeliger <[email protected]>
AuthorDate: Tue Apr 15 16:09:37 2014 -0500
Commit: Tom Rini <[email protected]>
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.
--- Makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
Makefile +4 -5
@@ -1096,13 +1096,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
Signature · 1 line
1.8.3.2
PATCH 1/1 Revert "build: Use filechk rules to create and update u-boot.lds"
Quoted 7 lines · Masahiro Yamada
This reverts commit
a8b993eb81c142a439c24b871a2317f765fe5397.Commit
a8b993ebclaims it fixesu-boot.ldsrule by replacing $(callif_changed) with $(call filechk).But the problem had already been fixed by commit
395e60cda few days before commita8b993ebwas posted.
Bummer. Sorry about that. I didn't see Masahiro's patch.
Quoted 2 lines
What is worse is
$(call filechk) is too strong to fix the problem and looks weird.
I'm sure I don't understand that critique at all. "Looks weird"?
However, your patch (395e60cdc) is better in that it catches both the regular top-level and the SPL build's load scripts. Mine did not.
jdl
PATCH 1/1 Revert "build: Use filechk rules to create and update u-boot.lds"
Hi Jon,
Quoted 4 lines
Quoted 2 lines
What is worse is
$(call filechk) is too strong to fix the problem and looks weird.I'm sure I don't understand that critique at all. "Looks weird"?
The linker script is processed by C-preprocessor. It means the dependency of included files should be tracked to decide if the linker script should be updated or not. This is the same as the rule of generationg objects. ( *.c -> *.o or *.S -> *.o)
$(call filechk ) does not do this dependency tracking and always runs the preprocessor.
The why it looks weird to me.
Best Regards
Masahiro Yamada
Quoted 27 lines · Masahiro Yamada
This reverts commit
a8b993eb81c142a439c24b871a2317f765fe5397.Commit
a8b993ebclaims it fixesu-boot.ldsrule by replacing $(callif_changed) with $(call filechk).But the problem had already been fixed by commit
395e60cda few days before commita8b993ebwas 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 <[email protected]>
AuthorDate: Wed Apr 9 20:10:43 2014 +0900
Commit: Tom Rini <[email protected]>
CommitDate: Fri Apr 11 10:08:42 2014 -0400
replaces $(callif_changed) -> $(callif_changed_dep)[2] commit
a8b993eb81c142a439c24b871a2317f765fe5397
Author: Jon Loeliger <[email protected]>
AuthorDate: Tue Apr 15 16:09:37 2014 -0500
Commit: Tom Rini <[email protected]>
CommitDate: Fri Apr 18 16:14:16 2014 -0400
replaces $(callif_changed) -> $(call filechk)
Quoted 7 lines
A conflict must have happened when applying [2], but somehow it was applied, sadly.
Signed-off-by Masahiro Yamada <[email protected]>Cc Jon Loeliger <[email protected]>Cc Andreas Bie?mann <[email protected]>Cc Tom Rini <[email protected]>
Whoops, Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140423/918592b0/attachment.pgp>