kbuild: use KBUILD_DEFCONFIG as the fallback for DEFCONFIG_LIST

Most of the Kconfig commands (except defconfig and all*config) read
the .config file as a base set of CONFIG options.

When it does not exist, the files in DEFCONFIG_LIST are searched in
this order and loaded if found.

I do not see much sense in the last two lines in DEFCONFIG_LIST.

[1] ARCH_DEFCONFIG

The entry for DEFCONFIG_LIST is guarded by 'depends on !UML'. So, the
ARCH_DEFCONFIG definition in arch/x86/um/Kconfig is meaningless.

arch/{sh,sparc,x86}/Kconfig define ARCH_DEFCONFIG depending on 32 or
64 bit variant symbols. This is a little bit strange; ARCH_DEFCONFIG
should be a fixed string because the base config file is loaded before
the symbol evaluation stage.

Using KBUILD_DEFCONFIG makes more sense because it is fixed before
Kconfig is invoked. Fortunately, arch/{sh,sparc,x86}/Makefile define it
in the same way, and it works as expected. Hence, replace ARCH_DEFCONFIG
with "arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)".

[2] arch/$(ARCH)/defconfig

This file path is no longer valid. The defconfig files are always located
in the arch configs/ directories.

  $ find arch -name defconfig | sort
  arch/alpha/configs/defconfig
  arch/arm64/configs/defconfig
  arch/csky/configs/defconfig
  arch/nds32/configs/defconfig
  arch/riscv/configs/defconfig
  arch/s390/configs/defconfig
  arch/unicore32/configs/defconfig

The path arch/*/configs/defconfig is already covered by
"arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)". So, this file path is
not necessary.

I moved the default KBUILD_DEFCONFIG to the top Makefile. Otherwise,
the 7 architectures listed above would end up with endless loop of
syncconfig.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

diff --git a/Makefile b/Makefile
index 22bc7cc4b1579c449b2fc0661d30686c47bbc0c3..5435d11d82761b0ff6e04b868dbd61d15e3d51ad 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -388,6 +388,9 @@ 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/arch/sh/Kconfig b/arch/sh/Kconfig
index 9ece111b02548097604f276f0ecb4177a38a0c7c..b4f0e37b83eb548b8937ce06cb9c7a2c7fd47e98 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -87,11 +87,6 @@ config SUPERH64
        select HAVE_EXIT_THREAD
        select KALLSYMS
 
-config ARCH_DEFCONFIG
-       string
-       default "arch/sh/configs/shx3_defconfig" if SUPERH32
-       default "arch/sh/configs/cayman_defconfig" if SUPERH64
-
 config GENERIC_BUG
        def_bool y
        depends on BUG && SUPERH32

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index c1dd6dd642f43aa597154d929cae371e613e78e1..0de15380d1fc5b83f03756b373a2979940d54e42 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -95,11 +95,6 @@ config SPARC64
        select PCI_DOMAINS if PCI
        select ARCH_HAS_GIGANTIC_PAGE
 
-config ARCH_DEFCONFIG
-       string
-       default "arch/sparc/configs/sparc32_defconfig" if SPARC32
-       default "arch/sparc/configs/sparc64_defconfig" if SPARC64
-
 config ARCH_PROC_KCORE_TEXT
        def_bool y
 

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index beea77046f9bab3eef998e8dd4c3248932dbc004..98935f4387f9e05bd2f6e3734be38cb72bbda4d4 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -240,11 +240,6 @@ config OUTPUT_FORMAT
        default "elf32-i386" if X86_32
        default "elf64-x86-64" if X86_64
 
-config ARCH_DEFCONFIG
-       string
-       default "arch/x86/configs/i386_defconfig" if X86_32
-       default "arch/x86/configs/x86_64_defconfig" if X86_64
-
 config LOCKDEP_SUPPORT
        def_bool y
 

diff --git a/arch/x86/um/Kconfig b/arch/x86/um/Kconfig
index a8985e1f7432f394ca1aac200ba23e8c416dd1cc..95d26a69088b176d53d2ff8056d13d332c704a18 100644 (file)
--- a/arch/x86/um/Kconfig
+++ b/arch/x86/um/Kconfig
@@ -27,11 +27,6 @@ config X86_64
        def_bool 64BIT
        select MODULES_USE_ELF_RELA
 
-config ARCH_DEFCONFIG
-       string
-       default "arch/um/configs/i386_defconfig" if X86_32
-       default "arch/um/configs/x86_64_defconfig" if X86_64
-
 config 3_LEVEL_PGTABLES
        bool "Three-level pagetables" if !64BIT
        default 64BIT

diff --git a/init/Kconfig b/init/Kconfig
index 20a6ac33761c98a6bb7466d5ec1a5e476b1eddda..240c1ed15c698da2763ad80682f40bf8411248c6 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -6,8 +6,7 @@ config DEFCONFIG_LIST
        default "/lib/modules/$(shell,uname -r)/.config"
        default "/etc/kernel-config"
        default "/boot/config-$(shell,uname -r)"
-       default ARCH_DEFCONFIG
-       default "arch/$(ARCH)/defconfig"
+       default "arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)"
 
 config CC_IS_GCC
        def_bool $(success,$(CC) --version | head -n 1 | grep -q gcc)

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 5887ceb6229e33668d2ace02c0b717ae8a91f651..c9d0a4a8efb3e30c361ce8338e16ad5e52f9aed0 100644 (file)
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -12,10 +12,6 @@ else
 Kconfig := Kconfig
 endif
 
-ifndef KBUILD_DEFCONFIG
-KBUILD_DEFCONFIG := defconfig
-endif
-
 ifeq ($(quiet),silent_)
 silent := -s
 endif