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

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

Merge "Add support for block disk encryption"

parents 3af6fd45 37c3300f

arch/arm64/configs/vendor/sdm660-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -675,6 +675,7 @@ CONFIG_CRYPTO_DEV_QCE=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_SYSTEM_TRUSTED_KEYS="verity.x509.pem"

CONFIG_XZ_DEC=y

CONFIG_PRINTK_TIME=y

arch/arm64/configs/vendor/sdm660_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -716,6 +716,7 @@ CONFIG_CRYPTO_DEV_QCE=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_SYSTEM_TRUSTED_KEYS="verity.x509.pem"

CONFIG_XZ_DEC=y

CONFIG_PRINTK_TIME=y

drivers/crypto/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -804,4 +804,14 @@ config CRYPTO_DEV_CCREE 


source "drivers/crypto/hisilicon/Kconfig"



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

drivers/crypto/msm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -4,3 +4,4 @@ obj-$(CONFIG_CRYPTO_DEV_QCEDEV) += qcedev.o 
obj-$(CONFIG_CRYPTO_DEV_QCEDEV) += qcedev_smmu.o

obj-$(CONFIG_CRYPTO_DEV_QCRYPTO) += qcrypto.o

obj-$(CONFIG_CRYPTO_DEV_OTA_CRYPTO) += ota_crypto.o

obj-$(CONFIG_CRYPTO_DEV_QCOM_ICE) += ice.o