From 395e60cdc292dc0183c6867d34b43f14a373df55 Mon Sep 17 00:00:00 2001
From: Masahiro Yamada <yamada.m@jp.panasonic.com>
Date: Wed, 9 Apr 2014 20:10:43 +0900
Subject: [PATCH] kbuild: fix a bug in regeneration of linker scripts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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>
---
Makefile | 6 +++---
spl/Makefile | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index b807e5cd5c8..b2937e95e1b 100644
--- a/Makefile
+++ b/Makefile
@@ -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 9f5dbf4f3bf..6fec2522a8c 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
--
GitLab