Merge branch 'for-linville' of git://github.com/kvalo/ath

[firefly-linux-kernel-4.4.55.git] / drivers / crypto / Kconfig

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 13857f5d28f782029c92772a46931de23b7c790e..03ccdb0ccf9ea3e6422e32ebfd8465633d744276 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -262,6 +262,17 @@ config CRYPTO_DEV_OMAP_AES
          OMAP processors have AES module accelerator. Select this if you
          want to use the OMAP module for AES algorithms.
 
+config CRYPTO_DEV_OMAP_DES
+       tristate "Support for OMAP DES3DES hw engine"
+       depends on ARCH_OMAP2PLUS
+       select CRYPTO_DES
+       select CRYPTO_BLKCIPHER2
+       help
+         OMAP processors have DES/3DES module accelerator. Select this if you
+         want to use the OMAP module for DES and 3DES algorithms. Currently
+         the ECB and CBC modes of operation supported by the driver. Also
+         accesses made on unaligned boundaries are also supported.
+
 config CRYPTO_DEV_PICOXCELL
        tristate "Support for picoXcell IPSEC and Layer2 crypto engines"
        depends on ARCH_PICOXCELL && HAVE_CLK
@@ -300,17 +311,6 @@ config CRYPTO_DEV_S5P
          Select this to offload Samsung S5PV210 or S5PC110 from AES
          algorithms execution.
 
-config CRYPTO_DEV_TEGRA_AES
-       tristate "Support for TEGRA AES hw engine"
-       depends on ARCH_TEGRA
-       select CRYPTO_AES
-       help
-         TEGRA processors have AES module accelerator. Select this if you
-         want to use the TEGRA module for AES algorithms.
-
-         To compile this driver as a module, choose M here: the module
-         will be called tegra-aes.
-
 config CRYPTO_DEV_NX
        bool "Support for IBM Power7+ in-Nest cryptographic acceleration"
        depends on PPC64 && IBMVIO