Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ceb4afb3 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Herbert Xu
Browse files

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: 89a82ef8 ("crypto: atmel-authenc - add support to authenc(hmac(shaX), Y(aes)) modes")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent db91af0f

drivers/crypto/Kconfig

+5 −4
Original line number Original line Diff line number Diff line
@@ -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