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

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

Merge "defconfig: trinket: enable configuration flag for Inline Crypto Engine"

parents ffee0e53 d6aa9c1c

arch/arm64/configs/vendor/trinket-perf_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -563,6 +563,7 @@ CONFIG_EXT4_FS=y 
CONFIG_EXT4_FS_SECURITY=y

CONFIG_F2FS_FS=y

CONFIG_F2FS_FS_SECURITY=y

CONFIG_F2FS_FS_ENCRYPTION=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QFMT_V2=y
@@ -599,6 +600,7 @@ CONFIG_CORESIGHT_DUMMY=y 
CONFIG_CORESIGHT_REMOTE_ETM=y

CONFIG_CORESIGHT_REMOTE_ETM_DEFAULT_ENABLE=0

CONFIG_CORESIGHT_EVENT=y

CONFIG_PFK=y

CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y

CONFIG_SECURITY=y

CONFIG_HARDENED_USERCOPY=y
@@ -612,6 +614,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=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_ARM64_CRYPTO=y

CONFIG_CRYPTO_SHA1_ARM64_CE=y

CONFIG_CRYPTO_SHA2_ARM64_CE=y

arch/arm64/configs/vendor/trinket_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -592,6 +592,7 @@ CONFIG_EXT4_FS=y 
CONFIG_EXT4_FS_SECURITY=y

CONFIG_F2FS_FS=y

CONFIG_F2FS_FS_SECURITY=y

CONFIG_F2FS_FS_ENCRYPTION=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QFMT_V2=y
@@ -682,6 +683,7 @@ CONFIG_CORESIGHT_REMOTE_ETM=y 
CONFIG_CORESIGHT_REMOTE_ETM_DEFAULT_ENABLE=0

CONFIG_CORESIGHT_TGU=y

CONFIG_CORESIGHT_EVENT=y

CONFIG_PFK=y

CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y

CONFIG_SECURITY=y

CONFIG_HARDENED_USERCOPY=y
@@ -696,6 +698,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=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_ARM64_CRYPTO=y

CONFIG_CRYPTO_SHA1_ARM64_CE=y

CONFIG_CRYPTO_SHA2_ARM64_CE=y