Skip to content

Commit 838a2e5

Browse files
lacombarlacombar
committed
kbuild: migrate all arch to the kconfig mainmenu upgrade
Signed-off-by: Arnaud Lacombe <[email protected]> Reviewed-by: Sam Ravnborg <[email protected]> Reviewed-by: Michal Marek <[email protected]>
1 parent c7abe86 commit 838a2e5

File tree

25 files changed

+12
-137
lines changed

25 files changed

+12
-137
lines changed

‎Kconfig

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
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"

‎arch/alpha/Kconfig

-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
#
2-
# For a description of the syntax of this configuration file,
3-
# see Documentation/kbuild/kconfig-language.txt.
4-
#
51
config ALPHA
62
bool
73
default y

‎arch/arm/Kconfig

-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
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-
81
config ARM
92
bool
103
default y

‎arch/avr32/Kconfig

-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
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-
81
config AVR32
92
def_bool y
103
# With EMBEDDED=n, we get lots of stuff automatically selected

‎arch/blackfin/Kconfig

-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
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-
81
config SYMBOL_PREFIX
92
string
103
default "_"

‎arch/cris/Kconfig

-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
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-
81
config MMU
92
bool
103
default y

‎arch/frv/Kconfig

-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
#
2-
# For a description of the syntax of this configuration file,
3-
# see Documentation/kbuild/kconfig-language.txt.
4-
#
51
config FRV
62
bool
73
default y
@@ -64,8 +60,6 @@ config HZ
6460
int
6561
default 1000
6662

67-
mainmenu "Fujitsu FR-V Kernel Configuration"
68-
6963
source "init/Kconfig"
7064

7165
source "kernel/Kconfig.freezer"

‎arch/h8300/Kconfig

-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
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-
81
config H8300
92
bool
103
default y

‎arch/ia64/Kconfig

-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
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-
81
source "init/Kconfig"
92

103
source "kernel/Kconfig.freezer"

‎arch/m32r/Kconfig

-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
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-
81
config M32R
92
bool
103
default y

‎arch/m68k/Kconfig

-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
#
2-
# For a description of the syntax of this configuration file,
3-
# see Documentation/kbuild/kconfig-language.txt.
4-
#
51
config M68K
62
bool
73
default y
@@ -65,8 +61,6 @@ config GENERIC_TIME
6561
config ARCH_USES_GETTIMEOFFSET
6662
def_bool y
6763

68-
mainmenu "Linux/68k Kernel Configuration"
69-
7064
source "init/Kconfig"
7165

7266
source "kernel/Kconfig.freezer"

‎arch/m68knommu/Kconfig

-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
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-
81
config M68K
92
bool
103
default y

‎arch/microblaze/Kconfig

-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
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-
61
config MICROBLAZE
72
def_bool y
83
select HAVE_MEMBLOCK

‎arch/mips/Kconfig

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ config MIPS
1212
select HAVE_FUNCTION_GRAPH_TRACER
1313
select RTC_LIB if !MACH_LOONGSON
1414

15-
mainmenu "Linux/MIPS Kernel Configuration"
16-
1715
menu "Machine selection"
1816

1917
config ZONE_DMA

‎arch/mn10300/Kconfig

-9
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
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-
81
config MN10300
92
def_bool y
103
select HAVE_OPROFILE
@@ -69,8 +62,6 @@ config HZ
6962
int
7063
default 1000
7164

72-
mainmenu "Matsushita MN10300/AM33 Kernel Configuration"
73-
7465
source "init/Kconfig"
7566

7667
source "kernel/Kconfig.freezer"

‎arch/parisc/Kconfig

-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
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-
81
config PARISC
92
def_bool y
103
select HAVE_IDE

‎arch/powerpc/Kconfig

-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
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-
71
source "arch/powerpc/platforms/Kconfig.cputype"
82

93
config PPC32

‎arch/s390/Kconfig

-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
#
2-
# For a description of the syntax of this configuration file,
3-
# see Documentation/kbuild/kconfig-language.txt.
4-
#
5-
61
config SCHED_MC
72
def_bool y
83
depends on SMP
@@ -78,8 +73,6 @@ config VIRT_CPU_ACCOUNTING
7873
config ARCH_SUPPORTS_DEBUG_PAGEALLOC
7974
def_bool y
8075

81-
mainmenu "Linux Kernel Configuration"
82-
8376
config S390
8477
def_bool y
8578
select USE_GENERIC_SMP_HELPERS if SMP

‎arch/score/Kconfig

-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
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-
61
menu "Machine selection"
72

83
choice

‎arch/sh/Kconfig

-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
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-
81
config SUPERH
92
def_bool y
103
select EMBEDDED

‎arch/sparc/Kconfig

-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
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-
71
config 64BIT
82
bool "64-bit kernel" if ARCH = "sparc"
93
default ARCH = "sparc64"

‎arch/um/Kconfig.common

-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ config MMU
1919
config NO_IOMEM
2020
def_bool y
2121

22-
mainmenu "Linux/Usermode Kernel Configuration"
23-
2422
config ISA
2523
bool
2624

‎arch/x86/Kconfig

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# x86 configuration
2-
mainmenu "Linux Kernel Configuration for x86"
3-
41
# Select 32 or 64 bit
52
config 64BIT
63
bool "64-bit kernel" if ARCH = "x86"

‎arch/xtensa/Kconfig

-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
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-
61
config FRAME_POINTER
72
def_bool n
83

‎scripts/kconfig/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-c
88
ifdef KBUILD_KCONFIG
99
Kconfig := $(KBUILD_KCONFIG)
1010
else
11-
Kconfig := arch/$(SRCARCH)/Kconfig
11+
Kconfig := Kconfig
1212
endif
1313

1414
xconfig: $(obj)/qconf

0 commit comments

Comments
 (0)