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

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

Merge "defconfig: Enable new file encryption flags"

parents 1fac48b8 4bad4441

arch/arm/configs/vendor/sdm429-bg-perf_defconfig

+8 −0
Original line number Diff line number Diff line
@@ -49,6 +49,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
@@ -269,6 +271,7 @@ CONFIG_SCSI_UFS_QCOM=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
@@ -493,6 +496,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_LEDS_QPNP_FLASH_V2=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_QPNP=y
@@ -584,6 +589,8 @@ CONFIG_MSM_BGCOM=y 
CONFIG_MSM_BGRSB=y

CONFIG_MSM_BGRSB_RPMSG=y

CONFIG_MSM_PIL_SSR_BG=y

CONFIG_QTI_CRYPTO_COMMON=y

CONFIG_QTI_CRYPTO_TZ=y

CONFIG_WCNSS_CORE=y

CONFIG_WCNSS_CORE_PRONTO=y

CONFIG_WCNSS_REGISTER_DUMP_ON_BITE=y
@@ -615,6 +622,7 @@ CONFIG_EXT4_FS_SECURITY=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/arm/configs/vendor/sdm429-bg_defconfig

+8 −0
Original line number Diff line number Diff line
@@ -50,6 +50,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
@@ -276,6 +278,7 @@ CONFIG_SCSI_UFSHCD_CMD_LOGGING=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
@@ -508,6 +511,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_LEDS_QPNP_FLASH_V2=y

CONFIG_EDAC=y

CONFIG_RTC_CLASS=y
@@ -610,6 +615,8 @@ CONFIG_MSM_BGCOM=y 
CONFIG_MSM_BGRSB=y

CONFIG_MSM_BGRSB_RPMSG=y

CONFIG_MSM_PIL_SSR_BG=y

CONFIG_QTI_CRYPTO_COMMON=y

CONFIG_QTI_CRYPTO_TZ=y

CONFIG_WCNSS_CORE=y

CONFIG_WCNSS_CORE_PRONTO=y

CONFIG_WCNSS_REGISTER_DUMP_ON_BITE=y
@@ -640,6 +647,7 @@ CONFIG_EXT4_FS_SECURITY=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