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

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

Merge "defconfig: Add android-verity support for system"

parents 31db7c5f 7c1908b2

arch/arm64/configs/msm-auto-perf_defconfig

+6 −0
Original line number Original line Diff line number Diff line
@@ -258,11 +258,16 @@ CONFIG_SCSI_UFSHCD_PLATFORM=y 
CONFIG_SCSI_UFS_QCOM=y

CONFIG_SCSI_UFS_QCOM=y

CONFIG_SCSI_UFS_QCOM_ICE=y

CONFIG_SCSI_UFS_QCOM_ICE=y

CONFIG_MD=y

CONFIG_MD=y

CONFIG_BLK_DEV_MD=y

# CONFIG_MD_AUTODETECT is not set

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_REQ_CRYPT=y

CONFIG_DM_UEVENT=y

CONFIG_DM_UEVENT=y

CONFIG_DM_VERITY=y

CONFIG_DM_VERITY=y

CONFIG_DM_VERITY_HASH_PREFETCH_MIN_SIZE=1

CONFIG_DM_ANDROID_VERITY=y

CONFIG_NETDEVICES=y

CONFIG_NETDEVICES=y

CONFIG_BONDING=y

CONFIG_BONDING=y

CONFIG_DUMMY=y

CONFIG_DUMMY=y
@@ -611,6 +616,7 @@ CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=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_ARM64_CRYPTO=y

CONFIG_ARM64_CRYPTO=y

CONFIG_CRYPTO_SHA1_ARM64_CE=y

CONFIG_CRYPTO_SHA1_ARM64_CE=y

CONFIG_CRYPTO_SHA2_ARM64_CE=y

CONFIG_CRYPTO_SHA2_ARM64_CE=y

arch/arm64/configs/msm-auto_defconfig

+6 −0
Original line number Original line Diff line number Diff line
@@ -259,11 +259,16 @@ CONFIG_SCSI_UFSHCD_PLATFORM=y 
CONFIG_SCSI_UFS_QCOM=y

CONFIG_SCSI_UFS_QCOM=y

CONFIG_SCSI_UFS_QCOM_ICE=y

CONFIG_SCSI_UFS_QCOM_ICE=y

CONFIG_MD=y

CONFIG_MD=y

CONFIG_BLK_DEV_MD=y

# CONFIG_MD_AUTODETECT is not set

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_REQ_CRYPT=y

CONFIG_DM_UEVENT=y

CONFIG_DM_UEVENT=y

CONFIG_DM_VERITY=y

CONFIG_DM_VERITY=y

CONFIG_DM_VERITY_HASH_PREFETCH_MIN_SIZE=1

CONFIG_DM_ANDROID_VERITY=y

CONFIG_NETDEVICES=y

CONFIG_NETDEVICES=y

CONFIG_BONDING=y

CONFIG_BONDING=y

CONFIG_DUMMY=y

CONFIG_DUMMY=y
@@ -655,6 +660,7 @@ CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=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_ARM64_CRYPTO=y

CONFIG_ARM64_CRYPTO=y

CONFIG_CRYPTO_SHA1_ARM64_CE=y

CONFIG_CRYPTO_SHA1_ARM64_CE=y

CONFIG_CRYPTO_SHA2_ARM64_CE=y

CONFIG_CRYPTO_SHA2_ARM64_CE=y