| Message ID | 20191113095550.15104-1-yuehaibing@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Herbert Xu |
| Headers | show |
| Series | [v3,-next] crypto: atmel - Fix build error of CRYPTO_AUTHENC | expand |
On Wed, Nov 13, 2019 at 05:55:50PM +0800, YueHaibing wrote: > If CRYPTO_DEV_ATMEL_AUTHENC is m, CRYPTO_DEV_ATMEL_SHA is m, > but CRYPTO_DEV_ATMEL_AES is y, building will fail: > > drivers/crypto/atmel-aes.o: In function `atmel_aes_authenc_init_tfm': > atmel-aes.c:(.text+0x670): undefined reference to `atmel_sha_authenc_get_reqsize' > atmel-aes.c:(.text+0x67a): undefined reference to `atmel_sha_authenc_spawn' > drivers/crypto/atmel-aes.o: In function `atmel_aes_authenc_setkey': > atmel-aes.c:(.text+0x7e5): undefined reference to `atmel_sha_authenc_setkey' > > Make CRYPTO_DEV_ATMEL_AUTHENC depend on CRYPTO_DEV_ATMEL_AES, > and select CRYPTO_DEV_ATMEL_SHA and CRYPTO_AUTHENC for it under there. > > Reported-by: Hulk Robot <hulkci@huawei.com> > Suggested-by: Herbert Xu <herbert@gondor.apana.org.au> > Fixes: 89a82ef87e01 ("crypto: atmel-authenc - add support to...") > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com> > --- > v3: fix log typo > v2: make CRYPTO_DEV_ATMEL_AUTHENC depends on DEV_ATMEL_AES > --- > drivers/crypto/Kconfig | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) Patch applied. Thanks.
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index c5cc04d..296e829 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -492,10 +492,9 @@ if CRYPTO_DEV_UX500 endif # if CRYPTO_DEV_UX500 config CRYPTO_DEV_ATMEL_AUTHENC - tristate "Support for Atmel IPSEC/SSL hw accelerator" + bool "Support for Atmel IPSEC/SSL hw accelerator" depends on ARCH_AT91 || COMPILE_TEST - select CRYPTO_DEV_ATMEL_AES - select CRYPTO_DEV_ATMEL_SHA + depends on CRYPTO_DEV_ATMEL_AES help Some Atmel processors can combine the AES and SHA hw accelerators to enhance support of IPSEC/SSL. @@ -507,8 +506,9 @@ config CRYPTO_DEV_ATMEL_AES depends on ARCH_AT91 || COMPILE_TEST select CRYPTO_AES select CRYPTO_AEAD - select CRYPTO_AUTHENC select CRYPTO_SKCIPHER + select CRYPTO_AUTHENC if CRYPTO_DEV_ATMEL_AUTHENC + select CRYPTO_DEV_ATMEL_SHA if CRYPTO_DEV_ATMEL_AUTHENC help Some Atmel processors have AES hw accelerator. Select this if you want to use the Atmel module for
If CRYPTO_DEV_ATMEL_AUTHENC is m, CRYPTO_DEV_ATMEL_SHA is m, but CRYPTO_DEV_ATMEL_AES is y, building will fail: drivers/crypto/atmel-aes.o: In function `atmel_aes_authenc_init_tfm': atmel-aes.c:(.text+0x670): undefined reference to `atmel_sha_authenc_get_reqsize' atmel-aes.c:(.text+0x67a): undefined reference to `atmel_sha_authenc_spawn' drivers/crypto/atmel-aes.o: In function `atmel_aes_authenc_setkey': atmel-aes.c:(.text+0x7e5): undefined reference to `atmel_sha_authenc_setkey' Make CRYPTO_DEV_ATMEL_AUTHENC depend on CRYPTO_DEV_ATMEL_AES, and select CRYPTO_DEV_ATMEL_SHA and CRYPTO_AUTHENC for it under there. Reported-by: Hulk Robot <hulkci@huawei.com> Suggested-by: Herbert Xu <herbert@gondor.apana.org.au> Fixes: 89a82ef87e01 ("crypto: atmel-authenc - add support to...") Signed-off-by: YueHaibing <yuehaibing@huawei.com> Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com> --- v3: fix log typo v2: make CRYPTO_DEV_ATMEL_AUTHENC depends on DEV_ATMEL_AES --- drivers/crypto/Kconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)