Revert Enable CFI on debug build

This reverts commit 212c97dd8ded53c0029346387ef7001e41b9fc16.

Change-Id: I1564e753e0ec16b2fde0d47c7a8fa09d8c98ec67
Reviewed-on: https://gerrit.mot.com/1296049
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Jira Key

diff --git a/arch/arm64/configs/ext_config/debug-erd9610.config b/arch/arm64/configs/ext_config/debug-erd9610.config
index 491b64a491e8a7e215ca3b45834f7b1dc8b356f5..64cef242af266625149bb1e098986bd365d5a42d 100644 (file)
--- a/arch/arm64/configs/ext_config/debug-erd9610.config
+++ b/arch/arm64/configs/ext_config/debug-erd9610.config
@@ -58,3 +58,10 @@ CONFIG_PAGE_POISONING=y
 # CONFIG_DEBUG_SNAPSHOT_MINIMIZED_MODE is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 
+# Disable CFI on debug build
+# CONFIG_CFI is not set
+# CONFIG_LTO is not set
+# CONFIG_CFI_CLANG is not set
+# CONFIG_LTO_CLANG is not set
+CONFIG_CFI_PERMISSIVE=y
+CONFIG_LTO_NONE=y