diff options
| author | Arnd Bergmann | 2017-02-06 13:32:15 +0100 |
|---|---|---|
| committer | Herbert Xu | 2017-02-11 10:52:29 +0100 |
| commit | ceb4afb3086ab08f0d1d9cb3da536a18ea2e5918 (patch) | |
| tree | 2b716a72324de8ad7de1bac09ab72ba2140b0a55 | |
| parent | crypto: algapi - make crypto_xor() and crypto_inc() alignment agnostic (diff) | |
| download | kernel-qcow2-linux-ceb4afb3086ab08f0d1d9cb3da536a18ea2e5918.tar.gz kernel-qcow2-linux-ceb4afb3086ab08f0d1d9cb3da536a18ea2e5918.tar.xz kernel-qcow2-linux-ceb4afb3086ab08f0d1d9cb3da536a18ea2e5918.zip | |
crypto: atmel - refine Kconfig dependencies
With the new authenc support, we get a harmless Kconfig warning:
warning: (CRYPTO_DEV_ATMEL_AUTHENC) selects CRYPTO_DEV_ATMEL_SHA which has unmet direct dependencies (CRYPTO && CRYPTO_HW && ARCH_AT91)
The problem is that each of the options has slightly different dependencies,
although they all seem to want the same thing: allow building for real AT91
targets that actually have the hardware, and possibly for compile testing.
This makes all four options consistent: instead of depending on a particular
dmaengine implementation, we depend on the ARM platform, CONFIG_COMPILE_TEST
as an alternative when that is turned off. This makes the 'select' statements
work correctly.
Fixes: 89a82ef87e01 ("crypto: atmel-authenc - add support to authenc(hmac(shaX), Y(aes)) modes")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| -rw-r--r-- | drivers/crypto/Kconfig | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index 74824612d3e9..f60de152a90d 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -417,7 +417,8 @@ config CRYPTO_DEV_BFIN_CRC config CRYPTO_DEV_ATMEL_AUTHENC tristate "Support for Atmel IPSEC/SSL hw accelerator" - depends on (ARCH_AT91 && HAS_DMA) || COMPILE_TEST + depends on HAS_DMA + depends on ARCH_AT91 || COMPILE_TEST select CRYPTO_AUTHENC select CRYPTO_DEV_ATMEL_AES select CRYPTO_DEV_ATMEL_SHA @@ -430,7 +431,7 @@ config CRYPTO_DEV_ATMEL_AUTHENC config CRYPTO_DEV_ATMEL_AES tristate "Support for Atmel AES hw accelerator" depends on HAS_DMA - depends on AT_XDMAC || AT_HDMAC || COMPILE_TEST + depends on ARCH_AT91 || COMPILE_TEST select CRYPTO_AES select CRYPTO_AEAD select CRYPTO_BLKCIPHER @@ -444,7 +445,7 @@ config CRYPTO_DEV_ATMEL_AES config CRYPTO_DEV_ATMEL_TDES tristate "Support for Atmel DES/TDES hw accelerator" - depends on ARCH_AT91 + depends on ARCH_AT91 || COMPILE_TEST select CRYPTO_DES select CRYPTO_BLKCIPHER help @@ -457,7 +458,7 @@ config CRYPTO_DEV_ATMEL_TDES config CRYPTO_DEV_ATMEL_SHA tristate "Support for Atmel SHA hw accelerator" - depends on ARCH_AT91 + depends on ARCH_AT91 || COMPILE_TEST select CRYPTO_HASH help Some Atmel processors have SHA1/SHA224/SHA256/SHA384/SHA512 |