Skip to content

Commit

Permalink
Makefile: use if_change_dep for u-boot.cfg
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
nvswarren authored and trini committed Sep 22, 2016
1 parent de4be9e commit fcd29a4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion scripts/Makefile.spl
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit fcd29a4

Please sign in to comment.