kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT
The meaning of CONFIG_EMBEDDED has long since been obsoleted; the option is used to configure any non-standard kernel with a much larger scope than only small devices. This patch renames the option to CONFIG_EXPERT in init/Kconfig and fixes references to the option throughout the kernel. A new CONFIG_EMBEDDED option is added that automatically selects CONFIG_EXPERT when enabled and can be used in the future to isolate options that should only be considered for embedded systems (RISC architectures, SLOB, etc). Calling the option "EXPERT" more accurately represents its intention: only expert users who understand the impact of the configuration changes they are making should enable it. Reviewed-by: Ingo Molnar <mingo@elte.hu> Acked-by: David Woodhouse <david.woodhouse@intel.com> Signed-off-by: David Rientjes <rientjes@google.com> Cc: Greg KH <gregkh@suse.de> Cc: "David S. Miller" <davem@davemloft.net> Cc: Jens Axboe <axboe@kernel.dk> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Robin Holt <holt@sgi.com> Cc: <linux-arch@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
12fcdba1b7
commit
6a108a14fa
@@ -6,7 +6,7 @@ menu "Input device support"
|
||||
depends on !S390
|
||||
|
||||
config INPUT
|
||||
tristate "Generic input layer (needed for keyboard, mouse, ...)" if EMBEDDED
|
||||
tristate "Generic input layer (needed for keyboard, mouse, ...)" if EXPERT
|
||||
default y
|
||||
help
|
||||
Say Y here if you have any input device (mouse, keyboard, tablet,
|
||||
@@ -67,7 +67,7 @@ config INPUT_SPARSEKMAP
|
||||
comment "Userland interfaces"
|
||||
|
||||
config INPUT_MOUSEDEV
|
||||
tristate "Mouse interface" if EMBEDDED
|
||||
tristate "Mouse interface" if EXPERT
|
||||
default y
|
||||
help
|
||||
Say Y here if you want your mouse to be accessible as char devices
|
||||
@@ -150,7 +150,7 @@ config INPUT_EVBUG
|
||||
module will be called evbug.
|
||||
|
||||
config INPUT_APMPOWER
|
||||
tristate "Input Power Event -> APM Bridge" if EMBEDDED
|
||||
tristate "Input Power Event -> APM Bridge" if EXPERT
|
||||
depends on INPUT && APM_EMULATION
|
||||
help
|
||||
Say Y here if you want suspend key events to trigger a user
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
# Input core configuration
|
||||
#
|
||||
menuconfig INPUT_KEYBOARD
|
||||
bool "Keyboards" if EMBEDDED || !X86
|
||||
bool "Keyboards" if EXPERT || !X86
|
||||
default y
|
||||
help
|
||||
Say Y here, and a list of supported keyboards will be displayed.
|
||||
@@ -57,7 +57,7 @@ config KEYBOARD_ATARI
|
||||
module will be called atakbd.
|
||||
|
||||
config KEYBOARD_ATKBD
|
||||
tristate "AT keyboard" if EMBEDDED || !X86
|
||||
tristate "AT keyboard" if EXPERT || !X86
|
||||
default y
|
||||
select SERIO
|
||||
select SERIO_LIBPS2
|
||||
|
||||
@@ -39,7 +39,7 @@ config MOUSE_PS2
|
||||
module will be called psmouse.
|
||||
|
||||
config MOUSE_PS2_ALPS
|
||||
bool "ALPS PS/2 mouse protocol extension" if EMBEDDED
|
||||
bool "ALPS PS/2 mouse protocol extension" if EXPERT
|
||||
default y
|
||||
depends on MOUSE_PS2
|
||||
help
|
||||
@@ -49,7 +49,7 @@ config MOUSE_PS2_ALPS
|
||||
If unsure, say Y.
|
||||
|
||||
config MOUSE_PS2_LOGIPS2PP
|
||||
bool "Logitech PS/2++ mouse protocol extension" if EMBEDDED
|
||||
bool "Logitech PS/2++ mouse protocol extension" if EXPERT
|
||||
default y
|
||||
depends on MOUSE_PS2
|
||||
help
|
||||
@@ -59,7 +59,7 @@ config MOUSE_PS2_LOGIPS2PP
|
||||
If unsure, say Y.
|
||||
|
||||
config MOUSE_PS2_SYNAPTICS
|
||||
bool "Synaptics PS/2 mouse protocol extension" if EMBEDDED
|
||||
bool "Synaptics PS/2 mouse protocol extension" if EXPERT
|
||||
default y
|
||||
depends on MOUSE_PS2
|
||||
help
|
||||
@@ -69,7 +69,7 @@ config MOUSE_PS2_SYNAPTICS
|
||||
If unsure, say Y.
|
||||
|
||||
config MOUSE_PS2_LIFEBOOK
|
||||
bool "Fujitsu Lifebook PS/2 mouse protocol extension" if EMBEDDED
|
||||
bool "Fujitsu Lifebook PS/2 mouse protocol extension" if EXPERT
|
||||
default y
|
||||
depends on MOUSE_PS2 && X86 && DMI
|
||||
help
|
||||
@@ -79,7 +79,7 @@ config MOUSE_PS2_LIFEBOOK
|
||||
If unsure, say Y.
|
||||
|
||||
config MOUSE_PS2_TRACKPOINT
|
||||
bool "IBM Trackpoint PS/2 mouse protocol extension" if EMBEDDED
|
||||
bool "IBM Trackpoint PS/2 mouse protocol extension" if EXPERT
|
||||
default y
|
||||
depends on MOUSE_PS2
|
||||
help
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
# Input core configuration
|
||||
#
|
||||
config SERIO
|
||||
tristate "Serial I/O support" if EMBEDDED || !X86
|
||||
tristate "Serial I/O support" if EXPERT || !X86
|
||||
default y
|
||||
help
|
||||
Say Yes here if you have any input device that uses serial I/O to
|
||||
@@ -19,7 +19,7 @@ config SERIO
|
||||
if SERIO
|
||||
|
||||
config SERIO_I8042
|
||||
tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86
|
||||
tristate "i8042 PC Keyboard controller" if EXPERT || !X86
|
||||
default y
|
||||
depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && \
|
||||
(!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN
|
||||
@@ -168,7 +168,7 @@ config SERIO_MACEPS2
|
||||
module will be called maceps2.
|
||||
|
||||
config SERIO_LIBPS2
|
||||
tristate "PS/2 driver library" if EMBEDDED
|
||||
tristate "PS/2 driver library" if EXPERT
|
||||
depends on SERIO_I8042 || SERIO_I8042=n
|
||||
help
|
||||
Say Y here if you are using a driver for device connected
|
||||
|
||||
@@ -540,62 +540,62 @@ config TOUCHSCREEN_MC13783
|
||||
|
||||
config TOUCHSCREEN_USB_EGALAX
|
||||
default y
|
||||
bool "eGalax, eTurboTouch CT-410/510/700 device support" if EMBEDDED
|
||||
bool "eGalax, eTurboTouch CT-410/510/700 device support" if EXPERT
|
||||
depends on TOUCHSCREEN_USB_COMPOSITE
|
||||
|
||||
config TOUCHSCREEN_USB_PANJIT
|
||||
default y
|
||||
bool "PanJit device support" if EMBEDDED
|
||||
bool "PanJit device support" if EXPERT
|
||||
depends on TOUCHSCREEN_USB_COMPOSITE
|
||||
|
||||
config TOUCHSCREEN_USB_3M
|
||||
default y
|
||||
bool "3M/Microtouch EX II series device support" if EMBEDDED
|
||||
bool "3M/Microtouch EX II series device support" if EXPERT
|
||||
depends on TOUCHSCREEN_USB_COMPOSITE
|
||||
|
||||
config TOUCHSCREEN_USB_ITM
|
||||
default y
|
||||
bool "ITM device support" if EMBEDDED
|
||||
bool "ITM device support" if EXPERT
|
||||
depends on TOUCHSCREEN_USB_COMPOSITE
|
||||
|
||||
config TOUCHSCREEN_USB_ETURBO
|
||||
default y
|
||||
bool "eTurboTouch (non-eGalax compatible) device support" if EMBEDDED
|
||||
bool "eTurboTouch (non-eGalax compatible) device support" if EXPERT
|
||||
depends on TOUCHSCREEN_USB_COMPOSITE
|
||||
|
||||
config TOUCHSCREEN_USB_GUNZE
|
||||
default y
|
||||
bool "Gunze AHL61 device support" if EMBEDDED
|
||||
bool "Gunze AHL61 device support" if EXPERT
|
||||
depends on TOUCHSCREEN_USB_COMPOSITE
|
||||
|
||||
config TOUCHSCREEN_USB_DMC_TSC10
|
||||
default y
|
||||
bool "DMC TSC-10/25 device support" if EMBEDDED
|
||||
bool "DMC TSC-10/25 device support" if EXPERT
|
||||
depends on TOUCHSCREEN_USB_COMPOSITE
|
||||
|
||||
config TOUCHSCREEN_USB_IRTOUCH
|
||||
default y
|
||||
bool "IRTOUCHSYSTEMS/UNITOP device support" if EMBEDDED
|
||||
bool "IRTOUCHSYSTEMS/UNITOP device support" if EXPERT
|
||||
depends on TOUCHSCREEN_USB_COMPOSITE
|
||||
|
||||
config TOUCHSCREEN_USB_IDEALTEK
|
||||
default y
|
||||
bool "IdealTEK URTC1000 device support" if EMBEDDED
|
||||
bool "IdealTEK URTC1000 device support" if EXPERT
|
||||
depends on TOUCHSCREEN_USB_COMPOSITE
|
||||
|
||||
config TOUCHSCREEN_USB_GENERAL_TOUCH
|
||||
default y
|
||||
bool "GeneralTouch Touchscreen device support" if EMBEDDED
|
||||
bool "GeneralTouch Touchscreen device support" if EXPERT
|
||||
depends on TOUCHSCREEN_USB_COMPOSITE
|
||||
|
||||
config TOUCHSCREEN_USB_GOTOP
|
||||
default y
|
||||
bool "GoTop Super_Q2/GogoPen/PenPower tablet device support" if EMBEDDED
|
||||
bool "GoTop Super_Q2/GogoPen/PenPower tablet device support" if EXPERT
|
||||
depends on TOUCHSCREEN_USB_COMPOSITE
|
||||
|
||||
config TOUCHSCREEN_USB_JASTEC
|
||||
default y
|
||||
bool "JASTEC/DigiTech DTR-02U USB touch controller device support" if EMBEDDED
|
||||
bool "JASTEC/DigiTech DTR-02U USB touch controller device support" if EXPERT
|
||||
depends on TOUCHSCREEN_USB_COMPOSITE
|
||||
|
||||
config TOUCHSCREEN_USB_E2I
|
||||
@@ -605,17 +605,17 @@ config TOUCHSCREEN_USB_E2I
|
||||
|
||||
config TOUCHSCREEN_USB_ZYTRONIC
|
||||
default y
|
||||
bool "Zytronic controller" if EMBEDDED
|
||||
bool "Zytronic controller" if EXPERT
|
||||
depends on TOUCHSCREEN_USB_COMPOSITE
|
||||
|
||||
config TOUCHSCREEN_USB_ETT_TC45USB
|
||||
default y
|
||||
bool "ET&T USB series TC4UM/TC5UH touchscreen controller support" if EMBEDDED
|
||||
bool "ET&T USB series TC4UM/TC5UH touchscreen controller support" if EXPERT
|
||||
depends on TOUCHSCREEN_USB_COMPOSITE
|
||||
|
||||
config TOUCHSCREEN_USB_NEXIO
|
||||
default y
|
||||
bool "NEXIO/iNexio device support" if EMBEDDED
|
||||
bool "NEXIO/iNexio device support" if EXPERT
|
||||
depends on TOUCHSCREEN_USB_COMPOSITE
|
||||
|
||||
config TOUCHSCREEN_TOUCHIT213
|
||||
|
||||
Reference in New Issue
Block a user