Commit ac14947c authored by Markus Schneider-Pargmann's avatar Markus Schneider-Pargmann Committed by Masahiro Yamada
Browse files

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: default avatarMarkus Schneider-Pargmann <msp@baylibre.com>
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent 407868de

scripts/kconfig/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ config-fragments = $(call configfiles,$@) 


%.config: $(obj)/conf

	$(if $(config-fragments),, $(error $@ fragment does not exists on this architecture))

	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m .config $(config-fragments)

	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m $(KCONFIG_CONFIG) $(config-fragments)

	$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig



PHONY += tinyconfig