Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 117a3012 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: msm: Enable AES crypto extensions for arm msm8937, msm8953"

parents f3af3c8d afb8ff54

arch/arm/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -2286,6 +2286,9 @@ source "arch/arm/Kconfig.debug" 
source "security/Kconfig"



source "crypto/Kconfig"

if CRYPTO

source "arch/arm/crypto/Kconfig"

endif



source "lib/Kconfig"

arch/arm/configs/msm8937-perf_defconfig

+5 −3
Original line number Diff line number Diff line
@@ -595,12 +595,14 @@ CONFIG_CRYPTO_NULL=y 
CONFIG_CRYPTO_CTR=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_SHA1_ARM_NEON=y

CONFIG_CRYPTO_SHA512_ARM_NEON=y

CONFIG_CRYPTO_AES_ARM_BS=y

CONFIG_CRYPTO_TWOFISH=y

CONFIG_CRYPTO_DEV_QCRYPTO=y

CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y

CONFIG_CRYPTO_DEV_QCEDEV=y

CONFIG_CRYPTO_DEV_OTA_CRYPTO=y

CONFIG_CRYPTO_DEV_QCOM_ICE=y

CONFIG_ARM_CRYPTO=y

CONFIG_CRYPTO_SHA1_ARM_NEON=y

CONFIG_CRYPTO_SHA512_ARM_NEON=y

CONFIG_CRYPTO_AES_ARM_BS=y

CONFIG_CRYPTO_AES_ARM_CE=y

arch/arm/configs/msm8937_defconfig

+5 −3
Original line number Diff line number Diff line
@@ -642,12 +642,14 @@ CONFIG_CRYPTO_NULL=y 
CONFIG_CRYPTO_CTR=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_SHA1_ARM_NEON=y

CONFIG_CRYPTO_SHA512_ARM_NEON=y

CONFIG_CRYPTO_AES_ARM_BS=y

CONFIG_CRYPTO_TWOFISH=y

CONFIG_CRYPTO_DEV_QCRYPTO=y

CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y

CONFIG_CRYPTO_DEV_QCEDEV=y

CONFIG_CRYPTO_DEV_OTA_CRYPTO=y

CONFIG_CRYPTO_DEV_QCOM_ICE=y

CONFIG_ARM_CRYPTO=y

CONFIG_CRYPTO_SHA1_ARM_NEON=y

CONFIG_CRYPTO_SHA512_ARM_NEON=y

CONFIG_CRYPTO_AES_ARM_BS=y

CONFIG_CRYPTO_AES_ARM_CE=y

arch/arm/configs/msmcortex-perf_defconfig

+5 −3
Original line number Diff line number Diff line
@@ -591,12 +591,14 @@ CONFIG_CRYPTO_NULL=y 
CONFIG_CRYPTO_CTR=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_SHA1_ARM_NEON=y

CONFIG_CRYPTO_SHA512_ARM_NEON=y

CONFIG_CRYPTO_AES_ARM_BS=y

CONFIG_CRYPTO_TWOFISH=y

CONFIG_CRYPTO_DEV_QCRYPTO=y

CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y

CONFIG_CRYPTO_DEV_QCEDEV=y

CONFIG_CRYPTO_DEV_OTA_CRYPTO=y

CONFIG_CRYPTO_DEV_QCOM_ICE=y

CONFIG_ARM_CRYPTO=y

CONFIG_CRYPTO_SHA1_ARM_NEON=y

CONFIG_CRYPTO_SHA512_ARM_NEON=y

CONFIG_CRYPTO_AES_ARM_BS=y

CONFIG_CRYPTO_AES_ARM_CE=y

arch/arm/configs/msmcortex_defconfig

+5 −3
Original line number Diff line number Diff line
@@ -622,9 +622,6 @@ CONFIG_CRYPTO_NULL=y 
CONFIG_CRYPTO_CTR=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_SHA1_ARM_NEON=y

CONFIG_CRYPTO_SHA512_ARM_NEON=y

CONFIG_CRYPTO_AES_ARM_BS=y

CONFIG_CRYPTO_TWOFISH=y

CONFIG_FIPS_ENABLE=y

CONFIG_CRYPTO_DEV_QCRYPTO=y
@@ -632,3 +629,8 @@ CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y 
CONFIG_CRYPTO_DEV_QCEDEV=y

CONFIG_CRYPTO_DEV_OTA_CRYPTO=y

CONFIG_CRYPTO_DEV_QCOM_ICE=y

CONFIG_ARM_CRYPTO=y

CONFIG_CRYPTO_SHA1_ARM_NEON=y

CONFIG_CRYPTO_SHA512_ARM_NEON=y

CONFIG_CRYPTO_AES_ARM_BS=y

CONFIG_CRYPTO_AES_ARM_CE=y