Use menuconfig objects: crypto hw

[linux-2.6] / drivers / crypto / Kconfig

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index ff8c4beaace41577ad384a171a63966e992b01e0..84ebfcc1ffb45ef8b89550dd05146975753d97ad 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -1,4 +1,9 @@
-menu "Hardware crypto devices"
+
+menuconfig CRYPTO_HW
+       bool "Hardware crypto devices"
+       default y
+
+if CRYPTO_HW

 
 config CRYPTO_DEV_PADLOCK
        tristate "Support for VIA PadLock ACE"
 
 config CRYPTO_DEV_PADLOCK
        tristate "Support for VIA PadLock ACE"


@@ -14,16 +19,6 @@ config CRYPTO_DEV_PADLOCK
          The instructions are used only when the CPU supports them.
          Otherwise software encryption is used.
 
          The instructions are used only when the CPU supports them.
          Otherwise software encryption is used.
 

-         Selecting M for this option will compile a helper module
-         padlock.ko that should autoload all below configured
-         algorithms. Don't worry if your hardware does not support
-         some or all of them. In such case padlock.ko will
-         simply write a single line into the kernel log informing
-         about its failure but everything will keep working fine.
-
-         If you are unsure, say M. The compiled module will be
-         called padlock.ko
-

 config CRYPTO_DEV_PADLOCK_AES
        tristate "PadLock driver for AES algorithm"
        depends on CRYPTO_DEV_PADLOCK
 config CRYPTO_DEV_PADLOCK_AES
        tristate "PadLock driver for AES algorithm"
        depends on CRYPTO_DEV_PADLOCK


@@ -55,15 +50,37 @@ source "arch/s390/crypto/Kconfig"
 
 config CRYPTO_DEV_GEODE
        tristate "Support for the Geode LX AES engine"
 
 config CRYPTO_DEV_GEODE
        tristate "Support for the Geode LX AES engine"

-       depends on CRYPTO && X86_32 && PCI
+       depends on X86_32 && PCI

        select CRYPTO_ALGAPI
        select CRYPTO_BLKCIPHER
        default m
        help
          Say 'Y' here to use the AMD Geode LX processor on-board AES
        select CRYPTO_ALGAPI
        select CRYPTO_BLKCIPHER
        default m
        help
          Say 'Y' here to use the AMD Geode LX processor on-board AES

-         engine for the CryptoAPI AES alogrithm.
+         engine for the CryptoAPI AES algorithm.

 
          To compile this driver as a module, choose M here: the module
          will be called geode-aes.
 
 
          To compile this driver as a module, choose M here: the module
          will be called geode-aes.
 

-endmenu
+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).
+
+endif # CRYPTO_HW