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

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

Merge "defconfig: bengal_32: Enable dm-default-key"

parents f5c51848 70c0f3ee

arch/arm/configs/vendor/bengal-perf_defconfig

+7 −0
Original line number Diff line number Diff line
@@ -285,9 +285,11 @@ CONFIG_SCSI_SCAN_ASYNC=y 
CONFIG_SCSI_UFSHCD=y

CONFIG_SCSI_UFSHCD_PLATFORM=y

CONFIG_SCSI_UFS_QCOM=y

CONFIG_SCSI_UFS_QCOM_ICE=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
@@ -605,6 +607,7 @@ CONFIG_UBIFS_FS_ADVANCED_COMPR=y 
CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ASCII=y

CONFIG_NLS_ISO8859_1=y

CONFIG_PFK=y

CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y

CONFIG_SECURITY=y

CONFIG_LSM_MMAP_MIN_ADDR=4096
@@ -619,6 +622,10 @@ CONFIG_CRYPTO_MD4=y 
CONFIG_CRYPTO_TWOFISH=y

CONFIG_CRYPTO_ANSI_CPRNG=y

CONFIG_CRYPTO_DEV_QCE=y

CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y

CONFIG_CRYPTO_DEV_QCRYPTO=y

CONFIG_CRYPTO_DEV_QCEDEV=y

CONFIG_CRYPTO_DEV_QCOM_ICE=y

CONFIG_XZ_DEC=y

CONFIG_STACK_HASH_ORDER_SHIFT=12

CONFIG_PRINTK_TIME=y

arch/arm/configs/vendor/bengal_defconfig

+7 −0
Original line number Diff line number Diff line
@@ -287,9 +287,11 @@ CONFIG_SCSI_SCAN_ASYNC=y 
CONFIG_SCSI_UFSHCD=y

CONFIG_SCSI_UFSHCD_PLATFORM=y

CONFIG_SCSI_UFS_QCOM=y

CONFIG_SCSI_UFS_QCOM_ICE=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
@@ -615,6 +617,7 @@ CONFIG_UBIFS_FS_ADVANCED_COMPR=y 
CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ASCII=y

CONFIG_NLS_ISO8859_1=y

CONFIG_PFK=y

CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y

CONFIG_SECURITY=y

CONFIG_LSM_MMAP_MIN_ADDR=4096
@@ -629,6 +632,10 @@ CONFIG_CRYPTO_MD4=y 
CONFIG_CRYPTO_TWOFISH=y

CONFIG_CRYPTO_ANSI_CPRNG=y

CONFIG_CRYPTO_DEV_QCE=y

CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y

CONFIG_CRYPTO_DEV_QCRYPTO=y

CONFIG_CRYPTO_DEV_QCEDEV=y

CONFIG_CRYPTO_DEV_QCOM_ICE=y

CONFIG_XZ_DEC=y

CONFIG_PRINTK_TIME=y

CONFIG_DYNAMIC_DEBUG=y