[RFC PATCH 2/3] ARM: mps2: Split into ARCH/MACH options

[Vladimir Murzin]

We are about to add MPS2 compatible R-class platform, so we'd need
fine grain control over what should go under M-calss.

Signed-off-by: Vladimir Murzin <vladimir.murzin at arm.com>
---
 arch/arm/Kconfig                | 12 ------------
 arch/arm/mach-versatile/Kconfig | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 0dda6523724d..7fa06db2d9e5 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -631,18 +631,6 @@ config ARCH_LPC18XX
 	  Support for NXP's LPC18xx Cortex-M3 and LPC43xx Cortex-M4
 	  high performance microcontrollers.
 
-config ARCH_MPS2
-	bool "ARM MPS2 platform"
-	depends on ARM_SINGLE_ARMV7M
-	select ARM_AMBA
-	select CLKSRC_MPS2
-	help
-	  Support for Cortex-M Prototyping System (or V2M-MPS2) which comes
-	  with a range of available cores like Cortex-M3/M4/M7.
-
-	  Please, note that depends which Application Note is used memory map
-	  for the platform may vary, so adjustment of RAM base might be needed.
-
 # Definitions to make life easier
 config ARCH_ACORN
 	bool
diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig
index 2ef226194c3a..18643af4f3e1 100644
--- a/arch/arm/mach-versatile/Kconfig
+++ b/arch/arm/mach-versatile/Kconfig
@@ -325,3 +325,35 @@ config ARCH_VEXPRESS_TC2_PM
 	  with a TC2 (A15x2 A7x3) big.LITTLE core tile.
 
 endif
+
+menuconfig ARCH_MPS2
+	bool "ARM MPS2 family"
+	depends on ARM_SINGLE_ARMV7M
+	select ARM_AMBA
+	select CLKSRC_MPS2
+	help
+         Support for Cortex-M Prototyping System (or V2M-MPS2) which comes
+         with a range of available cores like Cortex-M3/M4/M7.
+
+         Please, note that depends which Application Note is used memory map
+         for the platform may vary, so adjustment of RAM base might be needed.
+
+if ARCH_MPS2
+
+config MACH_MPS2_AN385
+	bool "ARM MPS2 Application Note 385"
+	default y
+
+config MACH_MPS2_AN385
+	bool "ARM MPS2 Application Note 385"
+	default y
+
+config MACH_MPS2_AN399
+	bool "ARM MPS2 Application Note 399"
+	default y
+
+config MACH_MPS2_AN400
+	bool "ARM MPS2 Application Note 400"
+	default y
+
+endif # MPS2
-- 
2.25.1