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

Commit f8465303 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "defconfig: msmcortex_mediabox: Disable MODULE_SIG""

parents 2bfc0eda 5b570ccf

arch/arm64/configs/msmcortex_mediabox-perf_defconfig

+3 −6
Original line number Diff line number Diff line
@@ -41,6 +41,9 @@ CONFIG_MODULES=y 
CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SIG=y

CONFIG_MODULE_SIG_FORCE=y

CONFIG_MODULE_SIG_SHA512=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_ARCH_QCOM=y

CONFIG_ARCH_MSM8998=y
@@ -619,7 +622,6 @@ CONFIG_SECURITY_SMACK=y 
CONFIG_CRYPTO_ECHAINIV=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_SHA512=y

CONFIG_CRYPTO_TWOFISH=y

CONFIG_CRYPTO_ANSI_CPRNG=y

CONFIG_CRYPTO_DEV_QCRYPTO=y
@@ -627,11 +629,6 @@ CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y 
CONFIG_CRYPTO_DEV_QCEDEV=y

CONFIG_CRYPTO_DEV_OTA_CRYPTO=y

CONFIG_CRYPTO_DEV_QCOM_ICE=y

CONFIG_ASYMMETRIC_KEY_TYPE=y

CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y

CONFIG_X509_CERTIFICATE_PARSER=y

CONFIG_PKCS7_MESSAGE_PARSER=y

CONFIG_SYSTEM_TRUSTED_KEYRING=y

CONFIG_SYSTEM_TRUSTED_KEYS="verity.x509.pem"

CONFIG_ARM64_CRYPTO=y

CONFIG_CRYPTO_SHA1_ARM64_CE=y

arch/arm64/configs/msmcortex_mediabox_defconfig

+3 −6
Original line number Diff line number Diff line
@@ -42,6 +42,9 @@ CONFIG_MODULES=y 
CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SIG=y

CONFIG_MODULE_SIG_FORCE=y

CONFIG_MODULE_SIG_SHA512=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_PARTITION_ADVANCED=y

# CONFIG_IOSCHED_DEADLINE is not set
@@ -680,7 +683,6 @@ CONFIG_SECURITY_SMACK=y 
CONFIG_CRYPTO_ECHAINIV=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_SHA512=y

CONFIG_CRYPTO_TWOFISH=y

CONFIG_CRYPTO_ANSI_CPRNG=y

CONFIG_CRYPTO_DEV_QCRYPTO=y
@@ -688,11 +690,6 @@ CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y 
CONFIG_CRYPTO_DEV_QCEDEV=y

CONFIG_CRYPTO_DEV_OTA_CRYPTO=y

CONFIG_CRYPTO_DEV_QCOM_ICE=y

CONFIG_ASYMMETRIC_KEY_TYPE=y

CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y

CONFIG_X509_CERTIFICATE_PARSER=y

CONFIG_PKCS7_MESSAGE_PARSER=y

CONFIG_SYSTEM_TRUSTED_KEYRING=y

CONFIG_ARM64_CRYPTO=y

CONFIG_CRYPTO_SHA1_ARM64_CE=y

CONFIG_CRYPTO_SHA2_ARM64_CE=y