mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
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: 89a82ef87e
("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>
This commit is contained in:
parent
db91af0fbe
commit
ceb4afb308
1 changed files with 5 additions and 4 deletions
|
@ -417,7 +417,8 @@ config CRYPTO_DEV_BFIN_CRC
|
||||||
|
|
||||||
config CRYPTO_DEV_ATMEL_AUTHENC
|
config CRYPTO_DEV_ATMEL_AUTHENC
|
||||||
tristate "Support for Atmel IPSEC/SSL hw accelerator"
|
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_AUTHENC
|
||||||
select CRYPTO_DEV_ATMEL_AES
|
select CRYPTO_DEV_ATMEL_AES
|
||||||
select CRYPTO_DEV_ATMEL_SHA
|
select CRYPTO_DEV_ATMEL_SHA
|
||||||
|
@ -430,7 +431,7 @@ config CRYPTO_DEV_ATMEL_AUTHENC
|
||||||
config CRYPTO_DEV_ATMEL_AES
|
config CRYPTO_DEV_ATMEL_AES
|
||||||
tristate "Support for Atmel AES hw accelerator"
|
tristate "Support for Atmel AES hw accelerator"
|
||||||
depends on HAS_DMA
|
depends on HAS_DMA
|
||||||
depends on AT_XDMAC || AT_HDMAC || COMPILE_TEST
|
depends on ARCH_AT91 || COMPILE_TEST
|
||||||
select CRYPTO_AES
|
select CRYPTO_AES
|
||||||
select CRYPTO_AEAD
|
select CRYPTO_AEAD
|
||||||
select CRYPTO_BLKCIPHER
|
select CRYPTO_BLKCIPHER
|
||||||
|
@ -444,7 +445,7 @@ config CRYPTO_DEV_ATMEL_AES
|
||||||
|
|
||||||
config CRYPTO_DEV_ATMEL_TDES
|
config CRYPTO_DEV_ATMEL_TDES
|
||||||
tristate "Support for Atmel DES/TDES hw accelerator"
|
tristate "Support for Atmel DES/TDES hw accelerator"
|
||||||
depends on ARCH_AT91
|
depends on ARCH_AT91 || COMPILE_TEST
|
||||||
select CRYPTO_DES
|
select CRYPTO_DES
|
||||||
select CRYPTO_BLKCIPHER
|
select CRYPTO_BLKCIPHER
|
||||||
help
|
help
|
||||||
|
@ -457,7 +458,7 @@ config CRYPTO_DEV_ATMEL_TDES
|
||||||
|
|
||||||
config CRYPTO_DEV_ATMEL_SHA
|
config CRYPTO_DEV_ATMEL_SHA
|
||||||
tristate "Support for Atmel SHA hw accelerator"
|
tristate "Support for Atmel SHA hw accelerator"
|
||||||
depends on ARCH_AT91
|
depends on ARCH_AT91 || COMPILE_TEST
|
||||||
select CRYPTO_HASH
|
select CRYPTO_HASH
|
||||||
help
|
help
|
||||||
Some Atmel processors have SHA1/SHA224/SHA256/SHA384/SHA512
|
Some Atmel processors have SHA1/SHA224/SHA256/SHA384/SHA512
|
||||||
|
|
Loading…
Reference in a new issue