arm64: make SCTLR compat config depend on CONFIG_ARMV7_COMPAT

Conflicts:
	arch/arm64/mm/proc.S

Change-Id: I76e0067839c96e3082b42c80d3fc670cf3d371b5
Signed-off-by: Rich Wiley <rwiley@nvidia.com>
Reviewed-on: http://git-master/r/422173
GVS: Gerrit_Virtual_Submit
Reviewed-by: Alexander Van Brunt <avanbrunt@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 0df94f10cda683659c5d9ca449c55bb9649c70d5..787cee384e1ce760010d2314680b28c6f9058205 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -218,17 +218,6 @@ config ARMV7_COMPAT
         If you want to execute ARMv7 applications, say Y
 
 
-config ARMV7_COMPAT_CP15_BARRIER
-       bool "Allow applications to use the CP15 barrier operations"
-       depends on ARMV7_COMPAT
-       default y
-       help
-        This option allows applications to use deprecated CP15 barrier
-        instructions. This is useful because this was the only way to create
-        a barrier on older ARM processors.
-
-        If you want to execute ARMv7 applications, say Y
-
 source "mm/Kconfig"
 
 endmenu

diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S
index 48fffb27a7bfa34f3f1efa65562c0fb1460fcdb5..9796b33a708b575b29859d3d92e7a0b3a94c6937 100644 (file)
--- a/arch/arm64/mm/proc.S
+++ b/arch/arm64/mm/proc.S
@@ -160,7 +160,7 @@ ENTRY(__cpu_setup)
        ret                                     // return to head.S
 ENDPROC(__cpu_setup)
 
-#ifdef CONFIG_ARMV7_COMPAT_CP15_BARRIER
+#ifdef CONFIG_ARMV7_COMPAT
        /*
         *                 n n            T
         *       U E      WT T UD     US IHBS