summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>2017-07-05 17:30:40 +0200
committerTom Rini <trini@konsulko.com>2017-07-22 15:36:19 -0400
commit0d982c5853304ca366de3d3fbb24a2fba410fa6e (patch)
tree48ba211f6fdeff5da2891b2046fdce59c03e6932 /Makefile
parent47a52cd1e4c2b1e5f205e337bf3e1ae83993b5a4 (diff)
downloadu-boot-0d982c5853304ca366de3d3fbb24a2fba410fa6e.tar.gz
Makefile: add dependencies to regenerate u-boot.cfg when lost
When running a 'make clean' or carelessly removing u-boot.cfg, all future make invocations (until autoconf is regenerated) will print an error for a missing u-boot.cfg due to missing rules and dependencies. This commit adds (i) an explicit rule dependency from all (which will invokes the configuration checker) to cfg, and (b) adds a rule to invoke scripts/Makefile.autoconf to regenerate u-boot.cfg. Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Reviewed-by: Simon Glass <sjg@chromium.org> Tested-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index a5f56880e3..a1a3aeac52 100644
--- a/Makefile
+++ b/Makefile
@@ -516,6 +516,9 @@ include/config/%.conf: $(KCONFIG_CONFIG) include/config/auto.conf.cmd
@# Otherwise, 'make silentoldconfig' would be invoked twice.
$(Q)touch include/config/auto.conf
+u-boot.cfg spl/u-boot.cfg tpl/u-boot.cfg: include/config.h FORCE
+ $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.autoconf $(@)
+
-include include/autoconf.mk
-include include/autoconf.mk.dep
@@ -851,7 +854,7 @@ quiet_cmd_cfgcheck = CFGCHK $2
cmd_cfgcheck = $(srctree)/scripts/check-config.sh $2 \
$(srctree)/scripts/config_whitelist.txt $(srctree)
-all: $(ALL-y)
+all: $(ALL-y) cfg
ifeq ($(CONFIG_DM_I2C_COMPAT)$(CONFIG_SANDBOX),y)
@echo "===================== WARNING ======================"
@echo "This board uses CONFIG_DM_I2C_COMPAT. Please remove"