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

This project is archived. Its data is read-only.

Commit bb8e6e67 authored Dec 03, 2014 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Dec 03, 2014

Merge "defconfig: msm: Enable FDE crypto for msm8916/39 32-bit"

parents f7bc9b44 dc12c3a4

arch/arm/configs/msm8916-perf_defconfig

+3 −1

Original line number	Diff line number	Diff line
		@@ -225,6 +225,7 @@ CONFIG_SCSI_SCAN_ASYNC=y
		CONFIG_MD=y
		CONFIG_BLK_DEV_DM=y
		CONFIG_DM_CRYPT=y
		CONFIG_DM_REQ_CRYPT=y
		CONFIG_NETDEVICES=y
		CONFIG_DUMMY=y
		CONFIG_TUN=y
		@@ -502,11 +503,12 @@ CONFIG_SECURITY_NETWORK=y
		CONFIG_LSM_MMAP_MIN_ADDR=4096
		CONFIG_SECURITY_SELINUX=y
		CONFIG_CRYPTO_NULL=y
		CONFIG_CRYPTO_XTS=y
		CONFIG_CRYPTO_XCBC=y
		CONFIG_CRYPTO_CTR=y
		CONFIG_CRYPTO_MD4=y
		CONFIG_CRYPTO_ARC4=y
		CONFIG_CRYPTO_TWOFISH=y
		CONFIG_CRYPTO_DEV_QCRYPTO=m
		CONFIG_CRYPTO_DEV_QCRYPTO=y
		CONFIG_CRYPTO_DEV_QCE=y
		CONFIG_CRYPTO_DEV_QCEDEV=y

arch/arm/configs/msm8916_defconfig

+3 −1

Original line number	Diff line number	Diff line
		@@ -236,6 +236,7 @@ CONFIG_SCSI_SCAN_ASYNC=y
		CONFIG_MD=y
		CONFIG_BLK_DEV_DM=y
		CONFIG_DM_CRYPT=y
		CONFIG_DM_REQ_CRYPT=y
		CONFIG_NETDEVICES=y
		CONFIG_DUMMY=y
		CONFIG_TUN=y
		@@ -560,11 +561,12 @@ CONFIG_LSM_MMAP_MIN_ADDR=4096
		CONFIG_SECURITY_SELINUX=y
		CONFIG_CRYPTO=y
		CONFIG_CRYPTO_NULL=y
		CONFIG_CRYPTO_XTS=y
		CONFIG_CRYPTO_XCBC=y
		CONFIG_CRYPTO_CTR=y
		CONFIG_CRYPTO_MD4=y
		CONFIG_CRYPTO_ARC4=y
		CONFIG_CRYPTO_TWOFISH=y
		CONFIG_CRYPTO_DEV_QCRYPTO=m
		CONFIG_CRYPTO_DEV_QCRYPTO=y
		CONFIG_CRYPTO_DEV_QCE=y
		CONFIG_CRYPTO_DEV_QCEDEV=y