~hc/RK356X_SDK_RELEASE.git

..	..	@@ -100,9 +100,11 @@
100	100	config CRYPTO_AES_ARM_BS
101	101	tristate "Bit sliced AES using NEON instructions"
102	102	depends on KERNEL_MODE_NEON
103		- select CRYPTO_BLKCIPHER
104		- select CRYPTO_SIMD
	103	+ select CRYPTO_SKCIPHER
	104	+ select CRYPTO_LIB_AES
105	105	select CRYPTO_AES
	106	+ select CRYPTO_CBC
	107	+ select CRYPTO_SIMD
106	108	help
107	109	Use a faster and more secure NEON based implementation of AES in CBC,
108	110	CTR and XTS modes
..	..	@@ -116,7 +118,8 @@
116	118	config CRYPTO_AES_ARM_CE
117	119	tristate "Accelerated AES using ARMv8 Crypto Extensions"
118	120	depends on KERNEL_MODE_NEON
119		- select CRYPTO_BLKCIPHER
	121	+ select CRYPTO_SKCIPHER
	122	+ select CRYPTO_LIB_AES
120	123	select CRYPTO_SIMD
121	124	help
122	125	Use an implementation of AES in CBC, CTR and XTS modes that uses
..	..	@@ -127,6 +130,7 @@
127	130	depends on KERNEL_MODE_NEON
128	131	select CRYPTO_HASH
129	132	select CRYPTO_CRYPTD
	133	+ select CRYPTO_GF128MUL
130	134	help
131	135	Use an implementation of GHASH (used by the GCM AEAD chaining mode)
132	136	that uses the 64x64 to 128 bit polynomial multiplication (vmull.p64)
..	..	@@ -135,17 +139,19 @@
135	139
136	140	config CRYPTO_CRCT10DIF_ARM_CE
137	141	tristate "CRCT10DIF digest algorithm using PMULL instructions"
138		- depends on KERNEL_MODE_NEON && CRC_T10DIF
	142	+ depends on KERNEL_MODE_NEON
	143	+ depends on CRC_T10DIF
139	144	select CRYPTO_HASH
140	145
141	146	config CRYPTO_CRC32_ARM_CE
142	147	tristate "CRC32(C) digest algorithm using CRC and/or PMULL instructions"
143		- depends on KERNEL_MODE_NEON && CRC32
	148	+ depends on KERNEL_MODE_NEON
	149	+ depends on CRC32
144	150	select CRYPTO_HASH
145	151
146	152	config CRYPTO_CHACHA20_NEON
147	153	tristate "NEON and scalar accelerated ChaCha stream cipher algorithms"
148		- select CRYPTO_BLKCIPHER
	154	+ select CRYPTO_SKCIPHER
149	155	select CRYPTO_ARCH_HAVE_LIB_CHACHA
150	156
151	157	config CRYPTO_POLY1305_ARM