diff options
author | Masahiro Yamada <masahiroy@kernel.org> | 2021-05-30 23:58:42 +0900 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-05-31 10:21:15 +0200 |
commit | 5843c2a40960a3b24c2d6f7568928275f17c2faa (patch) | |
tree | 82831bb50d9fe222e53b7aec182e85f760609739 /Makefile | |
parent | 663894d99c64fb74b012864366ca6b30088fc1b5 (diff) | |
download | barebox-5843c2a40960a3b24c2d6f7568928275f17c2faa.tar.gz barebox-5843c2a40960a3b24c2d6f7568928275f17c2faa.tar.xz |
kconfig: update to Linux 5.13-rc1
The previous sync was Linux 5.9-rc2.
Resync scripts/kconfig/ with Linux 5.13-rc1.
Highlights:
- make header names in include/config/ and CONFIG symbols match
(scripts/basic/fixdep.c was adjusted)
- remove all 'option' syntax
(common/Kconfig was adjusted)
- introduce KCONFIG_DEFCONFIG_LIST instead of 'option defconfig_list'
- bug fixes and cleanups of nconfig
- drop Qt4 support from xconfig
- bug fixes, improvements, cleanups of xconfig
- print a short log for syncconfig
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Link: https://lore.barebox.org/20210530145842.2610109-2-masahiroy@kernel.org
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -352,9 +352,6 @@ KCONFIG_CONFIG ?= .config export KCONFIG_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; \ @@ -596,8 +593,11 @@ $(KCONFIG_CONFIG): # This exploits the 'multi-target pattern rule' trick. # The syncconfig should be executed only once to make all the targets. # (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 +quiet_cmd_syncconfig = SYNC $@ + cmd_syncconfig = $(MAKE) -f $(srctree)/Makefile syncconfig + +%/config/auto.conf %/config/auto.conf.cmd %/generated/autoconf.h: $(KCONFIG_CONFIG) + +$(call cmd,syncconfig) else # !may-sync-config # External modules and some install targets need include/generated/autoconf.h # and include/config/auto.conf but do not care if they are up-to-date. @@ -941,7 +941,8 @@ scripts: scripts_basic PHONY += prepare archprepare prepare0 archprepare: outputmakefile scripts_basic include/config/kernel.release \ - $(version_h) include/generated/utsrelease.h include/config.h + $(version_h) include/generated/utsrelease.h include/config.h \ + include/generated/autoconf.h prepare0: archprepare FORCE ifneq ($(KBUILD_MODULES),) |