summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2020-04-22 15:45:18 +0900
committerSascha Hauer <s.hauer@pengutronix.de>2020-04-27 21:16:59 +0200
commit768ead294f25110a5e9f68011e0e26e6ea3e86db (patch)
treee30726ff2dfac4efd3d7996dd3b74ec534b96cc2 /Makefile
parentc6f95bc715c4dad2e189b8b6fcb29963c4cec1cd (diff)
downloadbarebox-768ead294f25110a5e9f68011e0e26e6ea3e86db.tar.gz
barebox-768ead294f25110a5e9f68011e0e26e6ea3e86db.tar.xz
kconfig: update to Linux 5.7-rc2
The previous sync was Linux 5.5. This updates Kconfig to Linux 5.7-rc2. Highlights: - add yes2modconfig and mod2yesconfig, which are useful for coping with syzbot configs in Linux - remove include/config/tristate.conf - show more precise help - fix various issues of 'make xconfig' Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 6fc822da4b..6263186242 100644
--- a/Makefile
+++ b/Makefile
@@ -176,6 +176,9 @@ SRCARCH := $(ARCH)
KCONFIG_CONFIG ?= .config
+# Default file for 'make defconfig'. This may be overridden by arch-Makefile.
+export KBUILD_DEFCONFIG := defconfig
+
# SHELL used by kbuild
CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
else if [ -x /bin/bash ]; then echo /bin/bash; \
@@ -468,7 +471,8 @@ $(KCONFIG_CONFIG):
#
# This exploits the 'multi-target pattern rule' trick.
# The syncconfig should be executed only once to make all the targets.
-%/auto.conf %/auto.conf.cmd %/tristate.conf: $(KCONFIG_CONFIG)
+# (Note: use the grouped target '&:' when we bump to GNU Make 4.3)
+%/auto.conf %/auto.conf.cmd: $(KCONFIG_CONFIG)
$(Q)$(MAKE) -f $(srctree)/Makefile syncconfig
endif # $(dot-config)