kconfig: make arch/*/configs/defconfig the default of KBUILD_DEFCONFIG

Until recently, if KBUILD_DEFCONFIG was not set by the arch Makefile,
the default path arch/*/defconfig was used.

The last users of the default are gone by the following commits:

- Commit f3e20ad67b4c ("s390: move arch/s390/defconfig to
  arch/s390/configs/defconfig")

- Commit 986a13769c4b ("alpha: move arch/alpha/defconfig to
  arch/alpha/configs/defconfig")

Let's set arch/*/configs/defconfig as a new default. This saves
KBUILD_DEFCONFIG for some architectures.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>

diff --git a/arch/alpha/Makefile b/arch/alpha/Makefile
index b3314e0dcb6fb0d3f92509365677a6735fa2f9c8..12dee59b011c0a1ebc10e1102a0ef6efa13b252a 100644 (file)
--- a/arch/alpha/Makefile
+++ b/arch/alpha/Makefile
@@ -8,8 +8,6 @@
 # Copyright (C) 1994 by Linus Torvalds
 #
 
-KBUILD_DEFCONFIG := defconfig
-
 NM := $(NM) -B
 
 LDFLAGS_vmlinux        := -static -N #-relax

diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
index 8fbd583b18e1fd4a25315f2020a31f22ded5b34e..7a45899db25bab0ed085e1397f23171f55b8b51c 100644 (file)
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@ -30,8 +30,6 @@ LDFLAGS_vmlinux       += --fix-cortex-a53-843419
   endif
 endif
 
-KBUILD_DEFCONFIG := defconfig
-
 # Check for binutils support for specific extensions
 lseinstr := $(call as-instr,.arch_extension lse,-DCONFIG_AS_LSE=1)
 

diff --git a/arch/csky/Makefile b/arch/csky/Makefile
index f9aab9157c4a6f0832081ba99ffa3462b4a910fb..fb1bbbd91954cdac76b8d42c4bca78acc4a7b947 100644 (file)
--- a/arch/csky/Makefile
+++ b/arch/csky/Makefile
@@ -1,7 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 OBJCOPYFLAGS           :=-O binary
 GZFLAGS                        :=-9
-KBUILD_DEFCONFIG       := defconfig
 
 ifdef CONFIG_CPU_HAS_FPU
 FPUEXT = f

diff --git a/arch/nds32/Makefile b/arch/nds32/Makefile
index 14dab5ad88ef636ac260340c625b38bc12902ae8..ccdca714202019884ccbf794923291dce728bc46 100644 (file)
--- a/arch/nds32/Makefile
+++ b/arch/nds32/Makefile
@@ -2,8 +2,6 @@
 LDFLAGS_vmlinux        := --no-undefined -X
 OBJCOPYFLAGS   := -O binary -R .note -R .note.gnu.build-id -R .comment -S
 
-KBUILD_DEFCONFIG := defconfig
-
 ifdef CONFIG_FUNCTION_TRACER
 arch-y += -malways-save-lp -mno-relax
 endif

diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile
index 6b0741c9f348729fd6899a721b67aaaa222be15e..f8b3b07e42474ea02ff44a5471fa6073838a9a35 100644 (file)
--- a/arch/riscv/Makefile
+++ b/arch/riscv/Makefile
@@ -16,8 +16,6 @@ endif
 KBUILD_AFLAGS_MODULE += -fPIC
 KBUILD_CFLAGS_MODULE += -fPIC
 
-KBUILD_DEFCONFIG = defconfig
-
 export BITS
 ifeq ($(CONFIG_ARCH_RV64I),y)
        BITS := 64

diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index de8521fc9de58da66c68ac15f795834914bf83ee..df1d6a150f3007a0cc6cfab410c9637ea0221170 100644 (file)
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -10,8 +10,6 @@
 # Copyright (C) 1994 by Linus Torvalds
 #
 
-KBUILD_DEFCONFIG := defconfig
-
 LD_BFD         := elf64-s390
 KBUILD_LDFLAGS := -m elf64_s390
 KBUILD_AFLAGS_MODULE += -fPIC

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