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

Commit b9ece90b authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Add support for block disk encryption"

parents 4cbea41c b8f1b6a6

arch/arm64/configs/vendor/sm8150-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -725,6 +725,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=y 
CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y

CONFIG_CRYPTO_DEV_QCRYPTO=y

CONFIG_CRYPTO_DEV_QCEDEV=y

CONFIG_CRYPTO_DEV_QCOM_ICE=y

CONFIG_ARM64_CRYPTO=y

CONFIG_CRYPTO_SHA1_ARM64_CE=y

CONFIG_CRYPTO_SHA2_ARM64_CE=y

arch/arm64/configs/vendor/sm8150_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -810,6 +810,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=y 
CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y

CONFIG_CRYPTO_DEV_QCRYPTO=y

CONFIG_CRYPTO_DEV_QCEDEV=y

CONFIG_CRYPTO_DEV_QCOM_ICE=y

CONFIG_ARM64_CRYPTO=y

CONFIG_CRYPTO_SHA1_ARM64_CE=y

CONFIG_CRYPTO_SHA2_ARM64_CE=y

arch/arm64/configs/vendor/trinket-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -703,6 +703,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=y 
CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y

CONFIG_CRYPTO_DEV_QCRYPTO=y

CONFIG_CRYPTO_DEV_QCEDEV=y

CONFIG_CRYPTO_DEV_QCOM_ICE=y

CONFIG_ARM64_CRYPTO=y

CONFIG_CRYPTO_SHA1_ARM64_CE=y

CONFIG_CRYPTO_SHA2_ARM64_CE=y

arch/arm64/configs/vendor/trinket_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -789,6 +789,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=y 
CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y

CONFIG_CRYPTO_DEV_QCRYPTO=y

CONFIG_CRYPTO_DEV_QCEDEV=y

CONFIG_CRYPTO_DEV_QCOM_ICE=y

CONFIG_ARM64_CRYPTO=y

CONFIG_CRYPTO_SHA1_ARM64_CE=y

CONFIG_CRYPTO_SHA2_ARM64_CE=y

drivers/crypto/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -771,4 +771,14 @@ config CRYPTO_DEV_ARTPEC6 


	  To compile this driver as a module, choose M here.



config CRYPTO_DEV_QCOM_ICE

        tristate "Inline Crypto Module"

        default n

        depends on BLK_DEV_DM

        help

          This driver supports Inline Crypto Engine for QTI chipsets, MSM8994

          and later, to accelerate crypto operations for storage needs.

          To compile this driver as a module, choose M here: the

          module will be called ice.



endif # CRYPTO_HW