Kconfig: clean up s390 Kconfig.
Subsystems (7)
PATCH 5/5 Kconfig: clean up s390 Kconfig.
From: Martin Schwidefsky <[email protected]>
[patch 5/5] Kconfig: clean up s390 Kconfig.
With the help of the new disable command and the menu hiding the s390 Kconfig can be cleaned up to use the standard drivers Kconfig menus.
Signed-off-by Martin Schwidefsky <[email protected]>
---
arch/s390/Kconfig | 64 +++++------ drivers/block/Kconfig | 4 drivers/char/Kconfig | 4 drivers/crypto/Kconfig | 23 ++++ drivers/s390/Kconfig | 241 --------------------------------------------- drivers/s390/block/Kconfig | 11 -- drivers/s390/char/Kconfig | 159 +++++++++++++++++++++++++++++ drivers/s390/net/Kconfig | 9 - include/asm-s390/param.h | 2 9 files changed, 226 insertions(+), 291 deletions(-)
arch/s390/Kconfig +29 -35
@@ -3,34 +3,40 @@ # see Documentation/kbuild/kconfig-language.txt. # +disable BT +disable DETECT_SOFTLOCKUP +disable GEN_RTC +disable HAMRADIO disable HW_CONSOLE +disable HW_RANDOM +disable IRDA +disable R3964 +disable RTC +disable SCSI_SATA +disable SCSI_SRP +disable SERIAL_NONSTANDARD +disable VT config MMU - bool - default y + def_bool y config LOCKDEP_SUPPORT - bool - default y + def_bool y config STACKTRACE_SUPPORT - bool - default y + def_bool y config RWSEM_GENERIC_SPINLOCK bool config RWSEM_XCHGADD_ALGORITHM - bool - default y + def_bool y config GENERIC_HWEIGHT - bool - default y + def_bool y config GENERIC_CALIBRATE_DELAY - bool - default y + def_bool y config GENERIC_BUST_SPINLOCK bool
@@ -38,8 +44,7 @@ config GENERIC_BUST_SPINLOCK mainmenu "Linux Kernel Configuration" config S390 - bool - default y + def_bool y source "init/Kconfig"
@@ -219,6 +224,10 @@ config WARN_STACK_SIZE This allows you to specify the maximum frame size a function may have without the compiler complaining about it. +comment "Kernel preemption" + +source "kernel/Kconfig.preempt" + source "mm/Kconfig" comment "I/O subsystem configuration"
@@ -264,17 +273,6 @@ config QDIO_DEBUG comment "Misc" -config PREEMPT - bool "Preemptible Kernel" - help - This option reduces the latency of the kernel when reacting to - real-time or interactive events by allowing a low priority process to - be preempted even if it is in kernel mode executing a system call. - This allows applications to run more reliably even when the system is - under load. - - Say N if you are unsure. - config IPL bool "Builtin IPL record support" help
@@ -430,6 +428,8 @@ config APPLDATA_NET_SUM This can also be compiled as a module, which will be called appldata_net_sum.o. +source kernel/Kconfig.hz + config NO_IDLE_HZ bool "No HZ timer ticks in idle" help
@@ -470,18 +470,12 @@ endmenu source "net/Kconfig" config PCMCIA - bool - default n - -source "drivers/base/Kconfig" - -source "drivers/connector/Kconfig" - -source "drivers/scsi/Kconfig" + def_bool n -source "drivers/s390/Kconfig" +config CCW + def_bool y -source "drivers/net/Kconfig" +source "drivers/Kconfig" source "fs/Kconfig"
drivers/block/Kconfig +2 -2
@@ -458,8 +458,6 @@ config CDROM_PKTCDVD_WCACHE this option is dangerous unless the CD-RW media is known good, as we don't do deferred write error handling yet. -source "drivers/s390/block/Kconfig" - config ATA_OVER_ETH tristate "ATA over Ethernet support" depends on NET
@@ -467,6 +465,8 @@ config ATA_OVER_ETH This driver provides Support for ATA over Ethernet block devices like the Coraid EtherDrive (R) Storage Blade. +source "drivers/s390/block/Kconfig" + endmenu endif
drivers/char/Kconfig +3 -1
@@ -1061,7 +1061,7 @@ config HPET_MMAP config HANGCHECK_TIMER tristate "Hangcheck timer" - depends on X86 || IA64 || PPC64 + depends on X86 || IA64 || PPC64 || S390 help The hangcheck-timer module detects when the system has gone out to lunch past a certain margin. It can reboot the system
@@ -1090,5 +1090,7 @@ config TELCLOCK sysfs directory, /sys/devices/platform/telco_clock, with a number of files for controlling the behavior of this hardware. +source "drivers/s390/char/Kconfig" + endmenu
drivers/crypto/Kconfig +23 -0
@@ -60,4 +60,27 @@ config CRYPTO_DEV_GEODE To compile this driver as a module, choose M here: the module will be called geode-aes. + +config ZCRYPT + tristate "Support for PCI-attached cryptographic adapters" + depends on S390 + select ZCRYPT_MONOLITHIC if ZCRYPT="y" + default "m" + help + Select this option if you want to use a PCI-attached cryptographic + adapter like: + + PCI Cryptographic Accelerator (PCICA) + + PCI Cryptographic Coprocessor (PCICC) + + PCI-X Cryptographic Coprocessor (PCIXCC) + + Crypto Express2 Coprocessor (CEX2C) + + Crypto Express2 Accelerator (CEX2A) + +config ZCRYPT_MONOLITHIC + bool "Monolithic zcrypt module" + depends on ZCRYPT="m" + help + Select this option if you want to have a single module z90crypt.ko + that contains all parts of the crypto device driver (ap bus, + request router and all the card drivers). + endmenu
drivers/s390/block/Kconfig +4 -7
@@ -1,11 +1,9 @@ -if S390 && BLOCK - comment "S/390 block device drivers" - depends on S390 + depends on S390 && BLOCK config BLK_DEV_XPRAM tristate "XPRAM disk support" - depends on S390 + depends on S390 && BLOCK help Select this option if you want to use your expanded storage on S/390 or zSeries as a disk. This is useful as a _fast_ swap device if you
@@ -15,12 +13,13 @@ config BLK_DEV_XPRAM config DCSSBLK tristate "DCSSBLK support" + depends on S390 && BLOCK help Support for dcss block device config DASD tristate "Support for DASD devices" - depends on CCW + depends on CCW && BLOCK help Enable this option if you want to access DASDs directly utilizing S/390s channel subsystem commands. This is necessary for running
@@ -62,5 +61,3 @@ config DASD_EER This driver provides a character device interface to the DASD extended error reporting. This is only needed if you want to use applications written for the EER facility. - -endif
drivers/s390/char/Kconfig +159 -0
159 lines not on this page · raw message
drivers/s390/Kconfig +0 -241
241 lines not on this page · raw message
drivers/s390/net/Kconfig +5 -4
@@ -3,7 +3,7 @@ menu "S/390 network device drivers" config LCS tristate "Lan Channel Station Interface" - depends on NETDEVICES && (NET_ETHERNET || TR || FDDI) + depends on CCW && NETDEVICES && (NET_ETHERNET || TR || FDDI) help Select this option if you want to use LCS networking on IBM S/390 or zSeries. This device driver supports Token Ring (IEEE 802.5),
@@ -13,7 +13,7 @@ config LCS config CTC tristate "CTC device support" - depends on NETDEVICES + depends on CCW && NETDEVICES help Select this option if you want to use channel-to-channel networking on IBM S/390 or zSeries. This device driver supports real CTC
@@ -24,6 +24,7 @@ config CTC config IUCV tristate "IUCV support (VM only)" + depends on S390 help Select this option if you want to use inter-user communication under VM or VIF. If unsure, say "Y" to enable a fast communication
@@ -52,7 +53,7 @@ config SMSGIUCV config CLAW tristate "CLAW device support" - depends on NETDEVICES + depends on CCW && NETDEVICES help This driver supports channel attached CLAW devices. CLAW is Common Link Access for Workstation. Common devices
@@ -62,7 +63,7 @@ config CLAW config QETH tristate "Gigabit Ethernet device support" - depends on NETDEVICES && IP_MULTICAST && QDIO + depends on CCW && NETDEVICES && IP_MULTICAST && QDIO help This driver supports the IBM S/390 and zSeries OSA Express adapters in QDIO mode (all media types), HiperSockets interfaces and VM GuestLAN
include/asm-s390/param.h +1 -1
@@ -10,7 +10,7 @@#define _ASMS390_PARAM_H#ifdef __KERNEL__ -# define HZ 100/* Internal kernel timer frequency */ +# define HZ CONFIG_HZ/* Internal kernel timer frequency */ # define USER_HZ 100/* .. some user interfaces are in "ticks" */ # define CLOCKS_PER_SEC (USER_HZ)/* like times() */ #endif