diff options
| author | Anders Roxell <anders.roxell@linaro.org> | 2018-06-28 10:57:30 +0200 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2018-06-28 10:58:53 +0200 |
| commit | bed78129ad753135a1278a826288af6ceabefac1 (patch) | |
| tree | 00e1ee3407c91a524157fa79dfb6e059a1983288 | |
| parent | 13db3f8cf0db88fb5223f3e5eff29ae46f11c697 (diff) | |
Makefile: kselftest-merge: prefer builtin over modulesmerge_config
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1187,7 +1187,7 @@ kselftest-clean: PHONY += kselftest-merge kselftest-merge: $(if $(wildcard $(objtree)/.config),, $(error No .config exists, config your kernel first!)) - $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \ + $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -y\ -m $(objtree)/.config \ $(srctree)/tools/testing/selftests/*/config +$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig |