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

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

Merge "defconfig: Enable new file encryption flags for msmnile"

parents d9eb77e6 733ab12f

arch/arm64/configs/vendor/sa8155-perf_defconfig

+8 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ CONFIG_MODVERSIONS=y 
CONFIG_MODULE_SIG=y

CONFIG_MODULE_SIG_FORCE=y

CONFIG_MODULE_SIG_SHA512=y

CONFIG_BLK_INLINE_ENCRYPTION=y

CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_CFQ_GROUP_IOSCHED=y

CONFIG_ARCH_QCOM=y
@@ -278,8 +280,11 @@ CONFIG_SCSI_SCAN_ASYNC=y 
CONFIG_SCSI_UFSHCD=y

CONFIG_SCSI_UFSHCD_PLATFORM=y

CONFIG_SCSI_UFS_QCOM=y

CONFIG_SCSI_UFS_CRYPTO=y

CONFIG_SCSI_UFS_CRYPTO_QTI=y

CONFIG_MD=y

CONFIG_BLK_DEV_DM=y

CONFIG_DM_DEFAULT_KEY=y

CONFIG_DM_UEVENT=y

CONFIG_DM_VERITY=y

CONFIG_DM_VERITY_FEC=y
@@ -578,6 +583,8 @@ CONFIG_MSM_PERFORMANCE=y 
CONFIG_MSM_DRM_TECHPACK=y

CONFIG_QMP_DEBUGFS_CLIENT=y

CONFIG_QCOM_CDSP_RM=y

CONFIG_QTI_CRYPTO_COMMON=y

CONFIG_QTI_CRYPTO_TZ=y

CONFIG_DEVFREQ_GOV_PASSIVE=y

CONFIG_QCOM_BIMC_BWMON=y

CONFIG_ARM_MEMLAT_MON=y
@@ -608,6 +615,7 @@ CONFIG_MSM_TZ_LOG=y 
CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_EXT4_ENCRYPTION=y

CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QFMT_V2=y

arch/arm64/configs/vendor/sa8155_defconfig

+8 −0
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ CONFIG_MODULE_SIG=y 
CONFIG_MODULE_SIG_FORCE=y

CONFIG_MODULE_SIG_SHA512=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_BLK_INLINE_ENCRYPTION=y

CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y

CONFIG_PARTITION_ADVANCED=y

# CONFIG_IOSCHED_DEADLINE is not set

CONFIG_CFQ_GROUP_IOSCHED=y
@@ -291,8 +293,11 @@ CONFIG_SCSI_UFSHCD=y 
CONFIG_SCSI_UFSHCD_PLATFORM=y

CONFIG_SCSI_UFS_QCOM=y

CONFIG_SCSI_UFSHCD_CMD_LOGGING=y

CONFIG_SCSI_UFS_CRYPTO=y

CONFIG_SCSI_UFS_CRYPTO_QTI=y

CONFIG_MD=y

CONFIG_BLK_DEV_DM=y

CONFIG_DM_DEFAULT_KEY=y

CONFIG_DM_UEVENT=y

CONFIG_DM_VERITY=y

CONFIG_DM_VERITY_FEC=y
@@ -611,6 +616,8 @@ CONFIG_MSM_PERFORMANCE=y 
CONFIG_MSM_DRM_TECHPACK=y

CONFIG_QMP_DEBUGFS_CLIENT=y

CONFIG_QCOM_CDSP_RM=y

CONFIG_QTI_CRYPTO_COMMON=y

CONFIG_QTI_CRYPTO_TZ=y

CONFIG_DEVFREQ_GOV_PASSIVE=y

CONFIG_QCOM_BIMC_BWMON=y

CONFIG_ARM_MEMLAT_MON=y
@@ -642,6 +649,7 @@ CONFIG_MSM_TZ_LOG=y 
CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_EXT4_ENCRYPTION=y

CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QFMT_V2=y