Revert "arm64: defconfig: msm: enable MODULE_SIG for msm chipsets"

This reverts commit 931a5101dfa4 ("arm64: defconfig: msm: enable
MODULE_SIG for msm chipsets").

Compilation of Android/DLKMs failing with below error:

Signing kernel module:  bus_timeout_mod.ko
Can't open perl script "./kernel/msm-4.4/scripts/sign-file": \
                                       No such file or directory
ninja: build stopped: subcommand failed.
make: *** [ninja_wrapper] Error 1

CRs-Fixed: 1035494
Change-Id: Iddc618a2467b8ba72a8466c2678b3195ef8fa1c7
Signed-off-by: Kyle Yan <kyan@codeaurora.org>

diff --git a/arch/arm64/configs/msm-perf_defconfig b/arch/arm64/configs/msm-perf_defconfig
index 7d842c7..4569736 100644 (file)
--- a/arch/arm64/configs/msm-perf_defconfig
+++ b/arch/arm64/configs/msm-perf_defconfig
@@ -36,8 +36,6 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
-CONFIG_MODULE_SIG=y
-CONFIG_MODULE_SIG_SHA512=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_ARCH_QCOM=y
 CONFIG_ARCH_MSM8996=y
@@ -567,6 +565,7 @@ CONFIG_CPU_FREQ_SWITCH_PROFILER=y
 CONFIG_DEBUG_SET_MODULE_RONX=y
 CONFIG_DEBUG_RODATA=y
 CONFIG_DEBUG_ALIGN_RODATA=y
+CONFIG_KEYS=y
 CONFIG_PFK=y
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
@@ -574,6 +573,7 @@ CONFIG_SECURITY_SELINUX=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

diff --git a/arch/arm64/configs/msm_defconfig b/arch/arm64/configs/msm_defconfig
index e7f255e..9862bef 100644 (file)
--- a/arch/arm64/configs/msm_defconfig
+++ b/arch/arm64/configs/msm_defconfig
@@ -33,8 +33,6 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
-CONFIG_MODULE_SIG=y
-CONFIG_MODULE_SIG_SHA512=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_ARCH_QCOM=y
 CONFIG_ARCH_MSM8996=y
@@ -605,6 +603,7 @@ CONFIG_ARM64_PTDUMP=y
 CONFIG_DEBUG_SET_MODULE_RONX=y
 CONFIG_FREE_PAGES_RDONLY=y
 CONFIG_KERNEL_TEXT_RDONLY=y
+CONFIG_KEYS=y
 CONFIG_PFK=y
 CONFIG_SECURITY=y
 CONFIG_SECURITY_SELINUX=y

diff --git a/arch/arm64/configs/msmcortex-perf_defconfig b/arch/arm64/configs/msmcortex-perf_defconfig
index d4084f3..df423ad 100644 (file)
--- a/arch/arm64/configs/msmcortex-perf_defconfig
+++ b/arch/arm64/configs/msmcortex-perf_defconfig
@@ -35,8 +35,6 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
-CONFIG_MODULE_SIG=y
-CONFIG_MODULE_SIG_SHA512=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_ARCH_QCOM=y
 CONFIG_ARCH_MSMCOBALT=y
@@ -536,6 +534,7 @@ CONFIG_CPU_FREQ_SWITCH_PROFILER=y
 CONFIG_DEBUG_SET_MODULE_RONX=y
 CONFIG_DEBUG_RODATA=y
 CONFIG_DEBUG_ALIGN_RODATA=y
+CONFIG_KEYS=y
 CONFIG_PFK=y
 CONFIG_SECURITY=y
 CONFIG_SECURITY_SELINUX=y

diff --git a/arch/arm64/configs/msmcortex_defconfig b/arch/arm64/configs/msmcortex_defconfig
index fa8465f..db5a2e8 100644 (file)
--- a/arch/arm64/configs/msmcortex_defconfig
+++ b/arch/arm64/configs/msmcortex_defconfig
@@ -34,8 +34,6 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
-CONFIG_MODULE_SIG=y
-CONFIG_MODULE_SIG_SHA512=y
 # CONFIG_BLK_DEV_BSG is not set
 CONFIG_PARTITION_ADVANCED=y
 # CONFIG_IOSCHED_DEADLINE is not set
@@ -622,6 +620,7 @@ CONFIG_CORESIGHT_TPDA=y
 CONFIG_CORESIGHT_TPDM=y
 CONFIG_CORESIGHT_QPDI=y
 CONFIG_CORESIGHT_SOURCE_DUMMY=y
+CONFIG_KEYS=y
 CONFIG_PFK=y
 CONFIG_SECURITY=y
 CONFIG_SECURITY_SELINUX=y