Skip to content

Commit 0d38128

Browse files
committed
Merge branch 'at91-5.10-trunk/defconfig' into linux-5.10-at91
2 parents a58b512 + 15f8828 commit 0d38128

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

arch/arm/configs/at91_dt_defconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,14 @@ CONFIG_NLS_ISO8859_1=y
243243
CONFIG_NLS_UTF8=y
244244
CONFIG_CRYPTO_CCM=y
245245
CONFIG_CRYPTO_GCM=y
246+
CONFIG_CRYPTO_CBC=y
247+
CONFIG_CRYPTO_CFB=y
248+
CONFIG_CRYPTO_OFB=y
249+
CONFIG_CRYPTO_XTS=y
250+
CONFIG_CRYPTO_SHA1=y
251+
CONFIG_CRYPTO_SHA512=y
246252
CONFIG_CRYPTO_ARC4=y
253+
CONFIG_CRYPTO_DES=y
247254
CONFIG_CRYPTO_USER_API_HASH=m
248255
CONFIG_CRYPTO_USER_API_SKCIPHER=m
249256
CONFIG_CRYPTO_DEV_ATMEL_AES=y

arch/arm/configs/sama5_defconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,14 @@ CONFIG_NLS_ISO8859_1=y
306306
CONFIG_NLS_UTF8=y
307307
CONFIG_CRYPTO_CCM=y
308308
CONFIG_CRYPTO_GCM=y
309+
CONFIG_CRYPTO_CBC=y
310+
CONFIG_CRYPTO_CFB=y
311+
CONFIG_CRYPTO_OFB=y
312+
CONFIG_CRYPTO_XTS=y
313+
CONFIG_CRYPTO_SHA1=y
314+
CONFIG_CRYPTO_SHA512=y
309315
CONFIG_CRYPTO_ARC4=y
316+
CONFIG_CRYPTO_DES=y
310317
CONFIG_CRYPTO_USER_API_HASH=m
311318
CONFIG_CRYPTO_USER_API_SKCIPHER=m
312319
CONFIG_CRYPTO_DEV_ATMEL_AES=y

0 commit comments

Comments
 (0)