Merge "defconfig: arm: Add dm-android-verity configs msm8909" (5327a03e) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm/configs/msm8909-perf_defconfig

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -226,11 +226,15 @@ CONFIG_CHR_DEV_SG=y
	CONFIG_CHR_DEV_SCH=y		CONFIG_CHR_DEV_SCH=y
	CONFIG_SCSI_SCAN_ASYNC=y		CONFIG_SCSI_SCAN_ASYNC=y
	CONFIG_MD=y		CONFIG_MD=y
			CONFIG_BLK_DEV_MD=y
			CONFIG_MD_LINEAR=y
	CONFIG_BLK_DEV_DM=y		CONFIG_BLK_DEV_DM=y
	CONFIG_DM_CRYPT=y		CONFIG_DM_CRYPT=y
			CONFIG_DM_REQ_CRYPT=y
	CONFIG_DM_UEVENT=y		CONFIG_DM_UEVENT=y
	CONFIG_DM_VERITY=y		CONFIG_DM_VERITY=y
	CONFIG_DM_VERITY_FEC=y		CONFIG_DM_VERITY_FEC=y
			CONFIG_DM_ANDROID_VERITY=y
	CONFIG_NETDEVICES=y		CONFIG_NETDEVICES=y
	CONFIG_DUMMY=y		CONFIG_DUMMY=y
	CONFIG_TUN=y		CONFIG_TUN=y
	@@ -492,9 +496,11 @@ CONFIG_CRYPTO_TWOFISH=y
	CONFIG_CRYPTO_ANSI_CPRNG=y		CONFIG_CRYPTO_ANSI_CPRNG=y
	CONFIG_CRYPTO_DEV_QCE=y		CONFIG_CRYPTO_DEV_QCE=y
	CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y		CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y
			CONFIG_CRYPTO_DEV_QCRYPTO=y
	CONFIG_CRYPTO_DEV_QCEDEV=y		CONFIG_CRYPTO_DEV_QCEDEV=y
	CONFIG_CRYPTO_DEV_OTA_CRYPTO=y		CONFIG_CRYPTO_DEV_OTA_CRYPTO=y
	CONFIG_CRYPTO_DEV_QCOM_ICE=y		CONFIG_CRYPTO_DEV_QCOM_ICE=y
			CONFIG_SYSTEM_TRUSTED_KEYS="verity.x509.pem"
	CONFIG_ARM_CRYPTO=y		CONFIG_ARM_CRYPTO=y
	CONFIG_CRYPTO_SHA1_ARM_NEON=y		CONFIG_CRYPTO_SHA1_ARM_NEON=y
	CONFIG_CRYPTO_SHA2_ARM_CE=y		CONFIG_CRYPTO_SHA2_ARM_CE=y

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -239,12 +239,16 @@ CONFIG_SCSI_UFS_QCOM=y
	CONFIG_SCSI_UFS_QCOM_ICE=y		CONFIG_SCSI_UFS_QCOM_ICE=y
	CONFIG_SCSI_UFSHCD_CMD_LOGGING=y		CONFIG_SCSI_UFSHCD_CMD_LOGGING=y
	CONFIG_MD=y		CONFIG_MD=y
			CONFIG_BLK_DEV_MD=y
			CONFIG_MD_LINEAR=y
	CONFIG_BLK_DEV_DM=y		CONFIG_BLK_DEV_DM=y
	CONFIG_DM_DEBUG=y		CONFIG_DM_DEBUG=y
	CONFIG_DM_CRYPT=y		CONFIG_DM_CRYPT=y
			CONFIG_DM_REQ_CRYPT=y
	CONFIG_DM_UEVENT=y		CONFIG_DM_UEVENT=y
	CONFIG_DM_VERITY=y		CONFIG_DM_VERITY=y
	CONFIG_DM_VERITY_FEC=y		CONFIG_DM_VERITY_FEC=y
			CONFIG_DM_ANDROID_VERITY=y
	CONFIG_NETDEVICES=y		CONFIG_NETDEVICES=y
	CONFIG_DUMMY=y		CONFIG_DUMMY=y
	CONFIG_TUN=y		CONFIG_TUN=y
	@@ -592,6 +596,7 @@ CONFIG_CRYPTO_DEV_QCRYPTO=y
	CONFIG_CRYPTO_DEV_QCEDEV=y		CONFIG_CRYPTO_DEV_QCEDEV=y
	CONFIG_CRYPTO_DEV_OTA_CRYPTO=y		CONFIG_CRYPTO_DEV_OTA_CRYPTO=y
	CONFIG_CRYPTO_DEV_QCOM_ICE=y		CONFIG_CRYPTO_DEV_QCOM_ICE=y
			CONFIG_SYSTEM_TRUSTED_KEYS="verity.x509.pem"
	CONFIG_ARM_CRYPTO=y		CONFIG_ARM_CRYPTO=y
	CONFIG_CRYPTO_SHA1_ARM_NEON=y		CONFIG_CRYPTO_SHA1_ARM_NEON=y
	CONFIG_CRYPTO_SHA2_ARM_CE=y		CONFIG_CRYPTO_SHA2_ARM_CE=y