From 891307ee1d03989228075d59da5bbc46cf69edaf Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Fri, 25 Sep 2020 11:21:49 +0800 Subject: [PATCH] ARM: rockchip_defconfig: merge r/android-4.19 android-recommended-arm.config https://android.googlesource.com/kernel/configs commit d298b222cd37 ("Freeze kernel configs for r.") +CONFIG_CRYPTO_SHA2_ARM_CE=y +CONFIG_CRYPTO_AES_ARM_CE=y commit 63f8ad1f4b79 ("Recommend enabling architecture-optimized AES and SHA-256") It's usually very helpful to enable AES-XTS and SHA-256 optimized with the ARM crypto extensions (or x86 AES-NI and SHA-NI). AES-XTS is used by file-based encryption; SHA-256 is used by dm-verity. I was a bit surprised to see that these weren't already in the recommended configs. Signed-off-by: Tao Huang Change-Id: Ibc40ed1b493f07eb92328024bff463903f50cb6f --- arch/arm/configs/rockchip_defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig index bce7a29f4175..52f049e29197 100644 --- a/arch/arm/configs/rockchip_defconfig +++ b/arch/arm/configs/rockchip_defconfig @@ -76,9 +76,10 @@ CONFIG_PM_ADVANCED_DEBUG=y CONFIG_ROCKCHIP_SIP=y CONFIG_ARM_CRYPTO=y CONFIG_CRYPTO_SHA1_ARM_NEON=y -CONFIG_CRYPTO_SHA256_ARM=y +CONFIG_CRYPTO_SHA2_ARM_CE=y CONFIG_CRYPTO_SHA512_ARM=y CONFIG_CRYPTO_AES_ARM_BS=y +CONFIG_CRYPTO_AES_ARM_CE=y CONFIG_JUMP_LABEL=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y