Skip to content

Commit

Permalink
kconfig: Use KCONFIG_CONFIG instead of .config
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Markus Schneider-Pargmann authored and Masahiro Yamada committed Dec 28, 2023
1 parent 407868d commit ac14947
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion scripts/kconfig/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ac14947

Please sign in to comment.