at91/kconfig: use similar kconfig presentation

keep the rm9200 in its own Kconfig until we move it to the at91 API

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

3 files changed, 83 insertions, 46 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ac0c802e48..7870b320f5 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -68,15 +68,6 @@ config ARM926EJS
 config ARMCORTEXA8
 	bool
 
-config ARCH_AT91SAM9260
-	bool
-	select ARM926EJS
-
-config ARCH_AT91SAM9263
-	bool
-	select ARM926EJS
-	select MACH_HAS_LOWLEVEL_INIT
-
 menu "System Type"
 
 choice
@@ -107,7 +98,7 @@ endchoice
 
 choice
 	prompt "Select your board"
-	depends on !ARCH_OMAP
+	depends on !ARCH_AT91 && !ARCH_AT91RM9200 && !ARCH_OMAP
 
 config MACH_MX1ADS
 	bool "mx1ads"
@@ -193,14 +184,6 @@ config MACH_FREESCALE_MX25_3STACK
 	  Say Y here if you are using the Freescale MX25 3stack board equipped
 	  with a Freescale i.MX25 Processor
 
-config MACH_ECO920
-	bool "eco920"
-	depends on ARCH_AT91RM9200
-	select HAS_AT91_ETHER
-	select HAS_CFI
-	help
-	  Say Y here if you are using the Motorola MX1ADS board
-
 config MACH_NXDB500
 	bool "Hilscher Netx nxdb500"
 	depends on ARCH_NETX
@@ -220,27 +203,6 @@ config MACH_PCM037
 	  Say Y here if you are using Phytec's phyCORE-i.MX31 (pcm037) equipped
 	  with a Freescale i.MX31 Processor
 
-config MACH_AT91SAM9260_EK
-	bool "Atmel AT91SAM9260-EK"
-	depends on ARCH_AT91
-	select ARCH_AT91SAM9260
-	help
-	  Say y here if you are using Atmel's AT91SAM9260-EK Evaluation board
-
-config MACH_AT91SAM9263_EK
-	bool "Atmel AT91SAM9263-EK"
-	depends on ARCH_AT91
-	select ARCH_AT91SAM9263
-	help
-	  Say y here if you are using Atmel's AT91SAM9263-EK Evaluation board
-
-config MACH_PM9263
-	bool "Ronetix PM9263"
-	depends on ARCH_AT91
-	select ARCH_AT91SAM9263
-	help
-	  Say y here if you are using the Ronetix PM9263 Board
-
 config MACH_A9M2410
 	bool "Digi A9M2410"
 	depends on ARCH_S3C24xx
@@ -272,13 +234,6 @@ config MACH_PCA100
 	  Say Y here if you are using Phytec's phyCard-i.MX27 (pca100) equipped
 	  with a Freescale i.MX27 Processor
 
-config MACH_MMCCPU
-	bool "Bucyrus MMC-CPU"
-	depends on ARCH_AT91
-	select ARCH_AT91SAM9263
-	help
-	  Say y here if you are using the Bucyrus MMC-CPU
-
 config MACH_EUKREA_CPUIMX27
 	bool "EUKREA CPUIMX27"
 	depends on ARCH_IMX
@@ -291,6 +246,8 @@ config MACH_EUKREA_CPUIMX27
 
 endchoice
 
+source arch/arm/mach-at91/Kconfig
+source arch/arm/mach-at91rm9200/Kconfig
 source arch/arm/mach-imx/Kconfig
 source arch/arm/mach-netx/Kconfig
 source arch/arm/mach-omap/Kconfig
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
new file mode 100644
index 0000000000..b0e6407b0a
--- /dev/null
+++ b/arch/arm/mach-at91/Kconfig
@@ -0,0 +1,62 @@
+if ARCH_AT91
+
+comment "Atmel AT91 System-on-Chip"
+
+choice
+	prompt "Atmel AT91 Processor"
+
+config ARCH_AT91SAM9260
+	bool "AT91SAM9260"
+	select ARM926EJS
+
+config ARCH_AT91SAM9263
+	bool "AT91SAM9263"
+	select ARM926EJS
+	select MACH_HAS_LOWLEVEL_INIT
+
+endchoice
+
+# ----------------------------------------------------------
+
+if ARCH_AT91SAM9260
+
+choice
+
+	prompt "AT91SAM9260 Board Type"
+
+config MACH_AT91SAM9260_EK
+	bool "Atmel AT91SAM9260-EK"
+	help
+	  Say y here if you are using Atmel's AT91SAM9260-EK Evaluation board
+
+endchoice
+
+endif
+
+# ----------------------------------------------------------
+
+if ARCH_AT91SAM9263
+
+choice
+	prompt "AT91SAM9263 Board Type"
+
+config MACH_AT91SAM9263_EK
+	bool "Atmel AT91SAM9263-EK"
+	help
+	  Say y here if you are using Atmel's AT91SAM9263-EK Evaluation board
+
+config MACH_MMCCPU
+	bool "Bucyrus MMC-CPU"
+	help
+	  Say y here if you are using the Bucyrus MMC-CPU
+
+config MACH_PM9263
+	bool "Ronetix PM9263"
+	help
+	  Say y here if you are using the Ronetix PM9263 Board
+
+endchoice
+
+endif
+
+endif
diff --git a/arch/arm/mach-at91rm9200/Kconfig b/arch/arm/mach-at91rm9200/Kconfig
new file mode 100644
index 0000000000..32b6105965
--- /dev/null
+++ b/arch/arm/mach-at91rm9200/Kconfig
@@ -0,0 +1,18 @@
+if ARCH_AT91RM9200
+
+comment "Atmel AT91RM9200 System-on-Chip"
+
+choice
+
+	prompt "AT91RM9200 Board Type"
+
+config MACH_ECO920
+	bool "eco920"
+	select HAS_AT91_ETHER
+	select HAS_CFI
+	help
+	  Say Y here if you are using the Motorola MX1ADS board
+
+endchoice
+
+endif