projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.10.55' into update
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
arch
/
arm
/
crypto
/
Makefile
diff --git
a/arch/arm/crypto/Makefile
b/arch/arm/crypto/Makefile
index a2c83851bc90a29f5f1d06415cb4a0db4dd726e1..a643a4c8f2ac8ae7b4e542051d60399005b3d327 100644
(file)
--- a/
arch/arm/crypto/Makefile
+++ b/
arch/arm/crypto/Makefile
@@
-5,5
+5,12
@@
obj-$(CONFIG_CRYPTO_AES_ARM) += aes-arm.o
obj-$(CONFIG_CRYPTO_SHA1_ARM) += sha1-arm.o
obj-$(CONFIG_CRYPTO_AES_ARM) += aes-arm.o
obj-$(CONFIG_CRYPTO_SHA1_ARM) += sha1-arm.o
+
+ifdef CONFIG_CRYPTO_AES_ARM32_CE
+KBUILD_AFLAGS :=$(KBUILD_AFLAGS:-msoft-float=-Wa,-mfpu=crypto-neon-fp-armv8)
+aes-arm-y := aes-armv8-aarch32.o aes_glue.o aes-armv8-bcm.o aes-armv8-bcm-glue.o
+else
aes-arm-y := aes-armv4.o aes_glue.o
aes-arm-y := aes-armv4.o aes_glue.o
+endif
+
sha1-arm-y := sha1-armv4-large.o sha1_glue.o
sha1-arm-y := sha1-armv4-large.o sha1_glue.o