aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2016-09-19 12:20:25 -0600
committerTom Rini <trini@konsulko.com>2016-09-22 11:34:59 -0400
commitfcd29a4d0e2ae3adbb129cf8e39eb025dc55e549 (patch)
treefb5a52c0580579c5be94d83bc2af22c941468ca9
parentde4be9ec171c1eb8aa5dbcaef8ee515ed0109ebe (diff)
downloadu-boot-fcd29a4d0e2ae3adbb129cf8e39eb025dc55e549.zip
u-boot-fcd29a4d0e2ae3adbb129cf8e39eb025dc55e549.tar.gz
u-boot-fcd29a4d0e2ae3adbb129cf8e39eb025dc55e549.tar.bz2
Makefile: use if_change_dep for u-boot.cfg
cmd_cpp_cfg generates a dependency output, but because it's invoked using if_changed rather than if_changed_dep, that dependency file is ignored. This results in Kbuild not knowing about which files u-boot.cfg depends on, so it may not be rebuilt when required. A practical result of this is that u-boot.cfg may continue to reference CONFIG_ options that no longer exist in the source tree, and this can cause the adhoc config options check to fail. This change modifies Makefile to use if_changed_dep, which in turn causes all dependencies to be known to the next make invocation. Signed-off-by: Stephen Warren <swarren@nvidia.com>
-rw-r--r--Makefile2
-rw-r--r--scripts/Makefile.spl2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index fffc188..949b264 100644
--- a/Makefile
+++ b/Makefile
@@ -937,7 +937,7 @@ u-boot.dis: u-boot
$(OBJDUMP) -d $< > $@
u-boot.cfg: include/config.h FORCE
- $(call if_changed,cpp_cfg)
+ $(call if_changed_dep,cpp_cfg)
# Check that this build does not use CONFIG options that we don't know about
# unless they are in Kconfig. All the existing CONFIG options are whitelisted,
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
index 4994fa8..d0d73d3 100644
--- a/scripts/Makefile.spl
+++ b/scripts/Makefile.spl
@@ -217,7 +217,7 @@ cmd_cpp_cfg = $(CPP) -Wp,-MD,$(depfile) $(cpp_flags) $(LDPPFLAGS) -ansi \
-DDO_DEPS_ONLY -D__ASSEMBLY__ -x assembler-with-cpp -P -dM -E -o $@ $<
$(obj)/$(SPL_BIN).cfg: include/config.h FORCE
- $(call if_changed,cpp_cfg)
+ $(call if_changed_dep,cpp_cfg)
pythonpath = PYTHONPATH=tools