diff mbox series

s390: move arch/s390/defconfig to arch/s390/configs/defconfig

Message ID 20190513021116.12191-1-yamada.masahiro@socionext.com
State Accepted
Commit f3e20ad67b4c8365df9818fd3c8026e105d6b53a
Headers show
Series s390: move arch/s390/defconfig to arch/s390/configs/defconfig | expand

Commit Message

Masahiro Yamada May 13, 2019, 2:11 a.m. UTC
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>

---

 arch/s390/Makefile                | 2 ++
 arch/s390/{ => configs}/defconfig | 0
 2 files changed, 2 insertions(+)
 rename arch/s390/{ => configs}/defconfig (100%)

-- 
2.17.1

Comments

Paul Walmsley May 13, 2019, 5:20 p.m. UTC | #1
On Mon, 13 May 2019, Masahiro Yamada wrote:

> 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>


Reviewed-by: Paul Walmsley <paul@pwsan.com>


- Paul
Martin Schwidefsky May 15, 2019, 8:45 a.m. UTC | #2
On Mon, 13 May 2019 11:11:16 +0900
Masahiro Yamada <yamada.masahiro@socionext.com> wrote:

> 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>


I have added this patch to my linux/s390 tree and will push it upstream
soon. Thanks!

> ---

> 

>  arch/s390/Makefile                | 2 ++

>  arch/s390/{ => configs}/defconfig | 0

>  2 files changed, 2 insertions(+)

>  rename arch/s390/{ => configs}/defconfig (100%)

> 

> 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

> similarity index 100%

> rename from arch/s390/defconfig

> rename to arch/s390/configs/defconfig



-- 
blue skies,
   Martin.

"Reality continues to ruin my life." - Calvin.
diff mbox series

Patch

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
similarity index 100%
rename from arch/s390/defconfig
rename to arch/s390/configs/defconfig