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

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

Merge "defconfig: Enable new file encryption flags for msmsteppe and sdmshrike"

parents 743e7dde a83bc9f8

arch/arm64/configs/vendor/sdmshrike-perf_defconfig

+9 −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
@@ -274,8 +276,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
@@ -570,6 +575,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
@@ -607,6 +614,8 @@ CONFIG_ESOC_MDM_DBG_ENG=y 
CONFIG_MSM_TZ_LOG=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_FS_ENCRYPTION=y

CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QFMT_V2=y

arch/arm64/configs/vendor/sdmshrike_defconfig

+8 −0
Original line number Diff line number Diff line
@@ -55,6 +55,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
@@ -287,8 +289,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
@@ -596,6 +601,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
@@ -636,6 +643,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/sdmsteppe-auto-perf_defconfig

+10 −0
Original line number Diff line number Diff line
@@ -51,6 +51,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
@@ -281,9 +283,12 @@ 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_CRYPT=y

CONFIG_DM_DEFAULT_KEY=y

CONFIG_DM_UEVENT=y

CONFIG_DM_VERITY=y

CONFIG_DM_VERITY_FEC=y
@@ -492,6 +497,8 @@ CONFIG_MMC_SDHCI=y 
CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_MMC_CQ_HCI=y

CONFIG_MMC_CQ_HCI_CRYPTO=y

CONFIG_MMC_CQ_HCI_CRYPTO_QTI=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_QPNP_FLASH_V2=y
@@ -604,6 +611,8 @@ CONFIG_QCOM_SMP2P_SLEEPSTATE=y 
CONFIG_QCOM_CDSP_RM=y

CONFIG_QCOM_CX_IPEAK=y

CONFIG_QCOM_ADSP_MANUAL_VOTE=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
@@ -643,6 +652,7 @@ CONFIG_EXT4_ENCRYPTION=y 
CONFIG_F2FS_FS=y

CONFIG_F2FS_FS_SECURITY=y

CONFIG_F2FS_FS_ENCRYPTION=y

CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QFMT_V2=y

arch/arm64/configs/vendor/sdmsteppe-auto_defconfig

+10 −0
Original line number Diff line number Diff line
@@ -53,6 +53,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
@@ -294,9 +296,12 @@ 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_CRYPT=y

CONFIG_DM_DEFAULT_KEY=y

CONFIG_DM_UEVENT=y

CONFIG_DM_VERITY=y

CONFIG_DM_VERITY_FEC=y
@@ -514,6 +519,8 @@ CONFIG_MMC_SDHCI=y 
CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_MMC_CQ_HCI=y

CONFIG_MMC_CQ_HCI_CRYPTO=y

CONFIG_MMC_CQ_HCI_CRYPTO_QTI=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_QPNP_FLASH_V2=y
@@ -640,6 +647,8 @@ CONFIG_QCOM_SMP2P_SLEEPSTATE=y 
CONFIG_QCOM_CDSP_RM=y

CONFIG_QCOM_CX_IPEAK=y

CONFIG_QCOM_ADSP_MANUAL_VOTE=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
@@ -681,6 +690,7 @@ CONFIG_EXT4_ENCRYPTION=y 
CONFIG_F2FS_FS=y

CONFIG_F2FS_FS_SECURITY=y

CONFIG_F2FS_FS_ENCRYPTION=y

CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QFMT_V2=y