Commit 838a2e55e6a4e9e8a10451ed2ef0f7a08dabdb04

Authored by Arnaud Lacombe
1 parent c7abe8630a

kbuild: migrate all arch to the kconfig mainmenu upgrade

Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Michal Marek <mmarek@suse.cz>

Showing 25 changed files with 12 additions and 137 deletions Side-by-side Diff

  1 +#
  2 +# For a description of the syntax of this configuration file,
  3 +# see Documentation/kbuild/kconfig-language.txt.
  4 +#
  5 +mainmenu "Linux/$ARCH $KERNELVERSION Kernel Configuration"
  6 +
  7 +config SRCARCH
  8 + string
  9 + option env="SRCARCH"
  10 +
  11 +source "arch/$SRCARCH/Kconfig"
1   -#
2   -# For a description of the syntax of this configuration file,
3   -# see Documentation/kbuild/kconfig-language.txt.
4   -#
5 1 config ALPHA
6 2 bool
7 3 default y
1   -#
2   -# For a description of the syntax of this configuration file,
3   -# see Documentation/kbuild/kconfig-language.txt.
4   -#
5   -
6   -mainmenu "Linux Kernel Configuration"
7   -
8 1 config ARM
9 2 bool
10 3 default y
1   -#
2   -# For a description of the syntax of this configuration file,
3   -# see Documentation/kbuild/kconfig-language.txt.
4   -#
5   -
6   -mainmenu "Linux Kernel Configuration"
7   -
8 1 config AVR32
9 2 def_bool y
10 3 # With EMBEDDED=n, we get lots of stuff automatically selected
arch/blackfin/Kconfig
1   -#
2   -# For a description of the syntax of this configuration file,
3   -# see Documentation/kbuild/kconfig-language.txt.
4   -#
5   -
6   -mainmenu "Blackfin Kernel Configuration"
7   -
8 1 config SYMBOL_PREFIX
9 2 string
10 3 default "_"
1   -#
2   -# For a description of the syntax of this configuration file,
3   -# see the Configure script.
4   -#
5   -
6   -mainmenu "Linux/CRIS Kernel Configuration"
7   -
8 1 config MMU
9 2 bool
10 3 default y
1   -#
2   -# For a description of the syntax of this configuration file,
3   -# see Documentation/kbuild/kconfig-language.txt.
4   -#
5 1 config FRV
6 2 bool
7 3 default y
... ... @@ -63,8 +59,6 @@
63 59 config HZ
64 60 int
65 61 default 1000
66   -
67   -mainmenu "Fujitsu FR-V Kernel Configuration"
68 62  
69 63 source "init/Kconfig"
70 64  
1   -#
2   -# For a description of the syntax of this configuration file,
3   -# see Documentation/kbuild/kconfig-language.txt.
4   -#
5   -
6   -mainmenu "uClinux/h8300 (w/o MMU) Kernel Configuration"
7   -
8 1 config H8300
9 2 bool
10 3 default y
1   -#
2   -# For a description of the syntax of this configuration file,
3   -# see Documentation/kbuild/kconfig-language.txt.
4   -#
5   -
6   -mainmenu "IA-64 Linux Kernel Configuration"
7   -
8 1 source "init/Kconfig"
9 2  
10 3 source "kernel/Kconfig.freezer"
1   -#
2   -# For a description of the syntax of this configuration file,
3   -# see Documentation/kbuild/kconfig-language.txt.
4   -#
5   -
6   -mainmenu "Linux/M32R Kernel Configuration"
7   -
8 1 config M32R
9 2 bool
10 3 default y
1   -#
2   -# For a description of the syntax of this configuration file,
3   -# see Documentation/kbuild/kconfig-language.txt.
4   -#
5 1 config M68K
6 2 bool
7 3 default y
... ... @@ -64,8 +60,6 @@
64 60  
65 61 config ARCH_USES_GETTIMEOFFSET
66 62 def_bool y
67   -
68   -mainmenu "Linux/68k Kernel Configuration"
69 63  
70 64 source "init/Kconfig"
71 65  
arch/m68knommu/Kconfig
1   -#
2   -# For a description of the syntax of this configuration file,
3   -# see Documentation/kbuild/kconfig-language.txt.
4   -#
5   -
6   -mainmenu "uClinux/68k (w/o MMU) Kernel Configuration"
7   -
8 1 config M68K
9 2 bool
10 3 default y
arch/microblaze/Kconfig
1   -# For a description of the syntax of this configuration file,
2   -# see Documentation/kbuild/kconfig-language.txt.
3   -
4   -mainmenu "Linux/Microblaze Kernel Configuration"
5   -
6 1 config MICROBLAZE
7 2 def_bool y
8 3 select HAVE_MEMBLOCK
... ... @@ -12,8 +12,6 @@
12 12 select HAVE_FUNCTION_GRAPH_TRACER
13 13 select RTC_LIB if !MACH_LOONGSON
14 14  
15   -mainmenu "Linux/MIPS Kernel Configuration"
16   -
17 15 menu "Machine selection"
18 16  
19 17 config ZONE_DMA
arch/mn10300/Kconfig
1   -#
2   -# For a description of the syntax of this configuration file,
3   -# see Documentation/kbuild/kconfig-language.txt.
4   -#
5   -
6   -mainmenu "Linux Kernel Configuration"
7   -
8 1 config MN10300
9 2 def_bool y
10 3 select HAVE_OPROFILE
... ... @@ -68,8 +61,6 @@
68 61 config HZ
69 62 int
70 63 default 1000
71   -
72   -mainmenu "Matsushita MN10300/AM33 Kernel Configuration"
73 64  
74 65 source "init/Kconfig"
75 66  
1   -#
2   -# For a description of the syntax of this configuration file,
3   -# see Documentation/kbuild/kconfig-language.txt.
4   -#
5   -
6   -mainmenu "Linux/PA-RISC Kernel Configuration"
7   -
8 1 config PARISC
9 2 def_bool y
10 3 select HAVE_IDE
arch/powerpc/Kconfig
1   -# For a description of the syntax of this configuration file,
2   -# see Documentation/kbuild/kconfig-language.txt.
3   -#
4   -
5   -mainmenu "Linux/PowerPC Kernel Configuration"
6   -
7 1 source "arch/powerpc/platforms/Kconfig.cputype"
8 2  
9 3 config PPC32
1   -#
2   -# For a description of the syntax of this configuration file,
3   -# see Documentation/kbuild/kconfig-language.txt.
4   -#
5   -
6 1 config SCHED_MC
7 2 def_bool y
8 3 depends on SMP
... ... @@ -77,8 +72,6 @@
77 72  
78 73 config ARCH_SUPPORTS_DEBUG_PAGEALLOC
79 74 def_bool y
80   -
81   -mainmenu "Linux Kernel Configuration"
82 75  
83 76 config S390
84 77 def_bool y
1   -# For a description of the syntax of this configuration file,
2   -# see Documentation/kbuild/kconfig-language.txt.
3   -
4   -mainmenu "Linux/SCORE Kernel Configuration"
5   -
6 1 menu "Machine selection"
7 2  
8 3 choice
1   -#
2   -# For a description of the syntax of this configuration file,
3   -# see Documentation/kbuild/kconfig-language.txt.
4   -#
5   -
6   -mainmenu "Linux/SuperH Kernel Configuration"
7   -
8 1 config SUPERH
9 2 def_bool y
10 3 select EMBEDDED
1   -# For a description of the syntax of this configuration file,
2   -# see Documentation/kbuild/kconfig-language.txt.
3   -#
4   -
5   -mainmenu "Linux/SPARC Kernel Configuration"
6   -
7 1 config 64BIT
8 2 bool "64-bit kernel" if ARCH = "sparc"
9 3 default ARCH = "sparc64"
arch/um/Kconfig.common
... ... @@ -19,8 +19,6 @@
19 19 config NO_IOMEM
20 20 def_bool y
21 21  
22   -mainmenu "Linux/Usermode Kernel Configuration"
23   -
24 22 config ISA
25 23 bool
26 24  
1   -# x86 configuration
2   -mainmenu "Linux Kernel Configuration for x86"
3   -
4 1 # Select 32 or 64 bit
5 2 config 64BIT
6 3 bool "64-bit kernel" if ARCH = "x86"
1   -# For a description of the syntax of this configuration file,
2   -# see Documentation/kbuild/kconfig-language.txt.
3   -
4   -mainmenu "Linux/Xtensa Kernel Configuration"
5   -
6 1 config FRAME_POINTER
7 2 def_bool n
8 3  
scripts/kconfig/Makefile
... ... @@ -8,7 +8,7 @@
8 8 ifdef KBUILD_KCONFIG
9 9 Kconfig := $(KBUILD_KCONFIG)
10 10 else
11   -Kconfig := arch/$(SRCARCH)/Kconfig
  11 +Kconfig := Kconfig
12 12 endif
13 13  
14 14 xconfig: $(obj)/qconf