diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-12-30 22:59:27 +0900 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-01-03 10:17:17 +0100 |
| commit | 997b70f585ef9bf2171c3f435efee3967e3036ec (patch) | |
| tree | d55e7840d814f39c7c5aa532790e96d90c075b32 /Makefile | |
| parent | 273dbe5f87de8d6129a68ad40e87922fb6e783b6 (diff) | |
| download | barebox-997b70f585ef9bf2171c3f435efee3967e3036ec.tar.gz barebox-997b70f585ef9bf2171c3f435efee3967e3036ec.tar.xz | |
kconfig: sync to Linux 4.20
The previous sync was commit 18895514dc5e ("kconfig: update to
v3.18-rc6").
Some commits were applied on top of that since then, but equivalent
fixups were done in Linux.
So, this commit overwrites everything scripts/kconfig/ with the one
from Linux 4.20
Highlights:
- 'silentoldconfig' has been renamed to 'syncconfig'
(the top Makefile needs to be adjusted)
- 'testconfig' target has been added for unit-tests
(the top Makefile needs to export PYTHON3 because
the test frame relies on Python3 and pytest)
- The perfect hash table generated by gperf has been removed
- The localization support has been removed
- The 'option env=VAR' has been replaced with more generic
variable reference syntax $(VAR)
(./Kconfig and common/Kconfig need to be adjusted)
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 17 |
1 files changed, 7 insertions, 10 deletions
@@ -284,6 +284,7 @@ GENKSYMS = scripts/genksyms/genksyms DEPMOD = /sbin/depmod KALLSYMS = scripts/kallsyms PERL = perl +PYTHON3 = python3 CHECK = sparse CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ -Wbitwise $(CF) @@ -323,7 +324,7 @@ KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC -export CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE +export CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL PYTHON3 UTS_MACHINE export LEX YACC export HOSTCXX HOSTCXXFLAGS HOSTLDFLAGS HOST_LOADLIBES LDFLAGS_MODULE CHECK CHECKFLAGS @@ -409,11 +410,9 @@ include $(srctree)/arch/$(ARCH)/Makefile export KBUILD_DEFCONFIG config: scripts_basic outputmakefile FORCE - $(Q)mkdir -p include/linux include/config $(Q)$(MAKE) $(build)=scripts/kconfig $@ %config: scripts_basic outputmakefile FORCE - $(Q)mkdir -p include/linux include/config $(Q)$(MAKE) $(build)=scripts/kconfig $@ else @@ -442,13 +441,11 @@ ifeq ($(dot-config),1) # To avoid any implicit rule to kick in, define an empty command $(KCONFIG_CONFIG) include/config/auto.conf.cmd: ; -# If .config is newer than include/config/auto.conf, someone tinkered -# with it and forgot to run make oldconfig. -# if auto.conf.cmd is missing then we are probably in a cleaned tree so -# we execute the config step to be sure to catch updated Kconfig files -include/config/auto.conf: $(KCONFIG_CONFIG) include/config/auto.conf.cmd - $(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig - +# The actual configuration files used during the build are stored in +# include/generated/ and include/config/. Update them if .config is newer than +# include/config/auto.conf (which mirrors .config). +include/config/%.conf: $(KCONFIG_CONFIG) include/config/auto.conf.cmd + $(Q)$(MAKE) -f $(srctree)/Makefile syncconfig else # Dummy target needed, because used as prerequisite include/config/auto.conf: ; |