1
0
Fork 0

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "Fix build issues in arm/aes-ce"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: arm/aes-ce - add dependency on AES library
  crypto: arm/aes-ce - build for v8 architecture explicitly
alistair/sunxi64-5.4-dsi
Linus Torvalds 2019-10-10 08:39:00 -07:00
commit fb20da6af7
2 changed files with 2 additions and 0 deletions

View File

@ -98,6 +98,7 @@ config CRYPTO_AES_ARM_CE
tristate "Accelerated AES using ARMv8 Crypto Extensions" tristate "Accelerated AES using ARMv8 Crypto Extensions"
depends on KERNEL_MODE_NEON depends on KERNEL_MODE_NEON
select CRYPTO_BLKCIPHER select CRYPTO_BLKCIPHER
select CRYPTO_LIB_AES
select CRYPTO_SIMD select CRYPTO_SIMD
help help
Use an implementation of AES in CBC, CTR and XTS modes that uses Use an implementation of AES in CBC, CTR and XTS modes that uses

View File

@ -9,6 +9,7 @@
#include <asm/assembler.h> #include <asm/assembler.h>
.text .text
.arch armv8-a
.fpu crypto-neon-fp-armv8 .fpu crypto-neon-fp-armv8
.align 3 .align 3