tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

kconfig: Use KCONFIG_CONFIG instead of .config

When using a custom location for kernel config files this merge config
command fails as it doesn't use the configuration set with
KCONFIG_CONFIG.

Signed-off-by: Markus Schneider-Pargmann <msp@baylibre.com>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

authored by

Markus Schneider-Pargmann and committed by
Masahiro Yamada ac14947c 407868de

+1 -1
+1 -1
scripts/kconfig/Makefile
··· 107 107 108 108 %.config: $(obj)/conf 109 109 $(if $(config-fragments),, $(error $@ fragment does not exists on this architecture)) 110 - $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m .config $(config-fragments) 110 + $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m $(KCONFIG_CONFIG) $(config-fragments) 111 111 $(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig 112 112 113 113 PHONY += tinyconfig