Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-2.6-microblaze.git] / drivers / crypto / Kconfig

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 4b75084..fe33c19 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -525,12 +525,26 @@ config CRYPTO_DEV_ATMEL_SHA
          To compile this driver as a module, choose M here: the module
          will be called atmel-sha.
 
+config CRYPTO_DEV_ATMEL_ECC
+       tristate "Support for Microchip / Atmel ECC hw accelerator"
+       depends on ARCH_AT91 || COMPILE_TEST
+       depends on I2C
+       select CRYPTO_ECDH
+       select CRC16
+       help
+         Microhip / Atmel ECC hw accelerator.
+         Select this if you want to use the Microchip / Atmel module for
+         ECDH algorithm.
+
+         To compile this driver as a module, choose M here: the module
+         will be called atmel-ecc.
+
 config CRYPTO_DEV_CCP
-       bool "Support for AMD Cryptographic Coprocessor"
+       bool "Support for AMD Secure Processor"
        depends on ((X86 && PCI) || (ARM64 && (OF_ADDRESS || ACPI))) && HAS_IOMEM
        help
-         The AMD Cryptographic Coprocessor provides hardware offload support
-         for encryption, hashing and related operations.
+         The AMD Secure Processor provides support for the Cryptographic Coprocessor
+         (CCP) and the Platform Security Processor (PSP) devices.
 
 if CRYPTO_DEV_CCP
        source "drivers/crypto/ccp/Kconfig"
@@ -616,6 +630,14 @@ config CRYPTO_DEV_SUN4I_SS
          To compile this driver as a module, choose M here: the module
          will be called sun4i-ss.
 
+config CRYPTO_DEV_SUN4I_SS_PRNG
+       bool "Support for Allwinner Security System PRNG"
+       depends on CRYPTO_DEV_SUN4I_SS
+       select CRYPTO_RNG
+       help
+         Select this option if you want to provide kernel-side support for
+         the Pseudo-Random Number Generator found in the Security System.
+
 config CRYPTO_DEV_ROCKCHIP
        tristate "Rockchip's Cryptographic Engine driver"
        depends on OF && ARCH_ROCKCHIP
@@ -686,4 +708,25 @@ config CRYPTO_DEV_SAFEXCEL
          chain mode, AES cipher mode and SHA1/SHA224/SHA256/SHA512 hash
          algorithms.
 
+config CRYPTO_DEV_ARTPEC6
+       tristate "Support for Axis ARTPEC-6/7 hardware crypto acceleration."
+       depends on ARM && (ARCH_ARTPEC || COMPILE_TEST)
+       depends on HAS_DMA
+       depends on OF
+       select CRYPTO_AEAD
+       select CRYPTO_AES
+       select CRYPTO_ALGAPI
+       select CRYPTO_BLKCIPHER
+       select CRYPTO_CTR
+       select CRYPTO_HASH
+       select CRYPTO_SHA1
+       select CRYPTO_SHA256
+       select CRYPTO_SHA384
+       select CRYPTO_SHA512
+       help
+         Enables the driver for the on-chip crypto accelerator
+         of Axis ARTPEC SoCs.
+
+         To compile this driver as a module, choose M here.
+
 endif # CRYPTO_HW