diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2021-03-14 04:48:33 +0900 |
|---|---|---|
| committer | Masahiro Yamada <masahiroy@kernel.org> | 2021-04-14 15:22:49 +0900 |
| commit | dd4659963a4d2dde9756e31ffe5d7c639bcaa26e (patch) | |
| tree | e8a74da1f749cf8019f169ae389481369e073a59 | |
| parent | b75b0a819af9f78fc395b189cddd40f590194d20 (diff) | |
kconfig: move default KBUILD_DEFCONFIG back to scripts/kconfig/Makefile
This is a partial revert of commit 2a86f6612164 ("kbuild: use
KBUILD_DEFCONFIG as the fallback for DEFCONFIG_LIST").
Now that the reference to $(DEFCONFIG_LIST) was removed from
init/Kconfig, the default KBUILD_DEFCONFIG can go back home.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | scripts/kconfig/Makefile | 4 |
2 files changed, 4 insertions, 3 deletions
@@ -396,9 +396,6 @@ endif KCONFIG_CONFIG ?= .config export KCONFIG_CONFIG -# Default file for 'make defconfig'. This may be overridden by arch-Makefile. -export KBUILD_DEFCONFIG := defconfig - # SHELL used by kbuild CONFIG_SHELL := sh diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 31c5735663c8..7df3c0e4c52e 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -9,6 +9,10 @@ else Kconfig := Kconfig endif +ifndef KBUILD_DEFCONFIG +KBUILD_DEFCONFIG := defconfig +endif + ifeq ($(quiet),silent_) silent := -s endif |