From 231aa95f2d2af5612ae7f4cbd81e217af310344c Mon Sep 17 00:00:00 2001 From: Will McVicker Date: Mon, 17 Oct 2022 16:56:07 -0700 Subject: [PATCH] ANDROID: gki_defconfig: update for 6.1-rc1 Based on the merges, configs in the gki_defconfig got shuffled around. Fix this. Fixes: 7d2521f10ab0 ("Merge 3604a7f568d3 ("Merge tag 'v6.1-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6") into android-mainline") Signed-off-by: Will McVicker Signed-off-by: Greg Kroah-Hartman Change-Id: I5e4c534b39d459a3906ce6f6dc99946251766070 --- arch/arm64/configs/gki_defconfig | 14 +++++++------- arch/x86/configs/gki_defconfig | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 12b3feeae994..e5e76ae4c559 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -75,10 +75,6 @@ CONFIG_ARM_SCPI_CPUFREQ=y CONFIG_ARM_SCMI_CPUFREQ=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=y -CONFIG_CRYPTO_SHA2_ARM64_CE=y -CONFIG_CRYPTO_SHA512_ARM64_CE=y -CONFIG_CRYPTO_POLYVAL_ARM64_CE=y -CONFIG_CRYPTO_AES_ARM64_CE_BLK=y CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y CONFIG_SHADOW_CALL_STACK=y @@ -634,17 +630,21 @@ CONFIG_STATIC_USERMODEHELPER=y CONFIG_STATIC_USERMODEHELPER_PATH="" CONFIG_SECURITY_SELINUX=y CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y -CONFIG_CRYPTO_CHACHA20POLY1305=y +CONFIG_CRYPTO_DES=y CONFIG_CRYPTO_ADIANTUM=y CONFIG_CRYPTO_HCTR2=y -CONFIG_CRYPTO_XCBC=y +CONFIG_CRYPTO_CHACHA20POLY1305=y CONFIG_CRYPTO_BLAKE2B=y CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_DES=y +CONFIG_CRYPTO_XCBC=y CONFIG_CRYPTO_LZO=y CONFIG_CRYPTO_LZ4=y CONFIG_CRYPTO_ZSTD=y CONFIG_CRYPTO_ANSI_CPRNG=y +CONFIG_CRYPTO_SHA2_ARM64_CE=y +CONFIG_CRYPTO_SHA512_ARM64_CE=y +CONFIG_CRYPTO_POLYVAL_ARM64_CE=y +CONFIG_CRYPTO_AES_ARM64_CE_BLK=y CONFIG_XZ_DEC=y CONFIG_DMA_CMA=y CONFIG_PRINTK_TIME=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index fe2baed6dc16..7ecc97dfb518 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -572,21 +572,21 @@ CONFIG_STATIC_USERMODEHELPER=y CONFIG_STATIC_USERMODEHELPER_PATH="" CONFIG_SECURITY_SELINUX=y CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y -CONFIG_CRYPTO_CHACHA20POLY1305=y +CONFIG_CRYPTO_DES=y CONFIG_CRYPTO_ADIANTUM=y CONFIG_CRYPTO_HCTR2=y -CONFIG_CRYPTO_XCBC=y +CONFIG_CRYPTO_CHACHA20POLY1305=y CONFIG_CRYPTO_BLAKE2B=y -CONFIG_CRYPTO_POLYVAL_CLMUL_NI=y CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_SHA256_SSSE3=y -CONFIG_CRYPTO_SHA512_SSSE3=y -CONFIG_CRYPTO_AES_NI_INTEL=y -CONFIG_CRYPTO_DES=y +CONFIG_CRYPTO_XCBC=y CONFIG_CRYPTO_LZO=y CONFIG_CRYPTO_LZ4=y CONFIG_CRYPTO_ZSTD=y CONFIG_CRYPTO_ANSI_CPRNG=y +CONFIG_CRYPTO_AES_NI_INTEL=y +CONFIG_CRYPTO_POLYVAL_CLMUL_NI=y +CONFIG_CRYPTO_SHA256_SSSE3=y +CONFIG_CRYPTO_SHA512_SSSE3=y CONFIG_CRC8=y CONFIG_XZ_DEC=y CONFIG_DMA_CMA=y