aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2019-05-13 11:11:16 +0900
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2019-05-14 17:54:48 +0200
commitf3e20ad67b4c8365df9818fd3c8026e105d6b53a (patch)
tree098859ee048950fc79336c462e1f9b0927ebc7be
parents390/qdio: optimize state inspection of HW-owned SBALs (diff)
downloadlinux-dev-f3e20ad67b4c8365df9818fd3c8026e105d6b53a.tar.xz
linux-dev-f3e20ad67b4c8365df9818fd3c8026e105d6b53a.zip
s390: move arch/s390/defconfig to arch/s390/configs/defconfig
As of Linux 5.1, alpha and s390 are the last architectures that have defconfig in arch/*/ instead of arch/*/configs/. $ find arch -name defconfig | sort arch/alpha/defconfig arch/arm64/configs/defconfig arch/csky/configs/defconfig arch/nds32/configs/defconfig arch/riscv/configs/defconfig arch/s390/defconfig The arch/$(ARCH)/defconfig is the hard-coded default in Kconfig, and I want to deprecate it after evacuating the remaining defconfig into the standard location, arch/*/configs/. Define KBUILD_DEFCONFIG like other architectures, and move defconfig into the configs/ subdirectory. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r--arch/s390/Makefile2
-rw-r--r--arch/s390/configs/defconfig (renamed from arch/s390/defconfig)0
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index df1d6a150f30..de8521fc9de5 100644
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -10,6 +10,8 @@
# 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/arch/s390/defconfig b/arch/s390/configs/defconfig
index c59b922cb6c5..c59b922cb6c5 100644
--- a/arch/s390/defconfig
+++ b/arch/s390/configs/defconfig