1 files changed, 64 insertions, 27 deletions

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 40e31c7daf08..98a42f3472d5 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -24,68 +24,66 @@ config SOC_AT91SAM9
 
 menu "Atmel AT91 System-on-Chip"
 
-choice
-        prompt "Atmel AT91 Processor"
+comment "Atmel AT91 Processor"
 
-config ARCH_AT91RM9200
+config SOC_AT91SAM9
+        bool
+        select CPU_ARM926T
+        select AT91_SAM9_TIME
+        select AT91_SAM9_SMC
+
+config SOC_AT91RM9200
         bool "AT91RM9200"
         select CPU_ARM920T
         select GENERIC_CLOCKEVENTS
         select HAVE_AT91_DBGU0
 
-config ARCH_AT91SAM9260
-        bool "AT91SAM9260 or AT91SAM9XE"
+config SOC_AT91SAM9260
+        bool "AT91SAM9260, AT91SAM9XE or AT91SAM9G20"
         select SOC_AT91SAM9
         select HAVE_AT91_DBGU0
         select HAVE_NET_MACB
+        help
+          Select this if you are using one of Atmel's AT91SAM9260, AT91SAM9XE
+          or AT91SAM9G20 SoC.
 
-config ARCH_AT91SAM9261
-        bool "AT91SAM9261"
-        select SOC_AT91SAM9
-        select HAVE_FB_ATMEL
-        select HAVE_AT91_DBGU0
-
-config ARCH_AT91SAM9G10
-        bool "AT91SAM9G10"
+config SOC_AT91SAM9261
+        bool "AT91SAM9261 or AT91SAM9G10"
         select SOC_AT91SAM9
         select HAVE_AT91_DBGU0
         select HAVE_FB_ATMEL
+        help
+          Select this if you are using one of Atmel's AT91SAM9261 or AT91SAM9G10 SoC.
 
-config ARCH_AT91SAM9263
+config SOC_AT91SAM9263
         bool "AT91SAM9263"
         select SOC_AT91SAM9
+        select HAVE_AT91_DBGU1
         select HAVE_FB_ATMEL
         select HAVE_NET_MACB
-        select HAVE_AT91_DBGU1
 
-config ARCH_AT91SAM9RL
+config SOC_AT91SAM9RL
         bool "AT91SAM9RL"
         select SOC_AT91SAM9
-        select HAVE_FB_ATMEL
         select HAVE_AT91_DBGU0
+        select HAVE_FB_ATMEL
 
-config ARCH_AT91SAM9G20
-        bool "AT91SAM9G20"
-        select SOC_AT91SAM9
-        select HAVE_AT91_DBGU0
-        select HAVE_NET_MACB
-
-config ARCH_AT91SAM9G45
+config SOC_AT91SAM9G45
         bool "AT91SAM9G45 or AT91SAM9M10 families"
         select SOC_AT91SAM9
+        select HAVE_AT91_DBGU1
         select HAVE_FB_ATMEL
         select HAVE_NET_MACB
-        select HAVE_AT91_DBGU1
         help
           Select this if you are using one of Atmel's AT91SAM9G45 family SoC.
           This support covers AT91SAM9G45, AT91SAM9G46, AT91SAM9M10 and AT91SAM9M11.
 
-config ARCH_AT91SAM9X5
+config SOC_AT91SAM9X5
         bool "AT91SAM9x5 family"
         select SOC_AT91SAM9
+        select HAVE_AT91_DBGU0
         select HAVE_FB_ATMEL
         select HAVE_NET_MACB
-        select HAVE_AT91_DBGU0
         help
           Select this if you are using one of Atmel's AT91SAM9x5 family SoC.
           This means that your SAM9 name finishes with a '5' (except if it is
@@ -93,8 +91,47 @@ config ARCH_AT91SAM9X5
           This support covers AT91SAM9G15, AT91SAM9G25, AT91SAM9X25, AT91SAM9G35
           and AT91SAM9X35.
 
+choice
+        prompt "Atmel AT91 Processor Devices for non DT boards"
+
+config ARCH_AT91_NONE
+        bool "None"
+
+config ARCH_AT91RM9200
+        bool "AT91RM9200"
+        select SOC_AT91RM9200
+
+config ARCH_AT91SAM9260
+        bool "AT91SAM9260 or AT91SAM9XE"
+        select SOC_AT91SAM9260
+
+config ARCH_AT91SAM9261
+        bool "AT91SAM9261"
+        select SOC_AT91SAM9261
+
+config ARCH_AT91SAM9G10
+        bool "AT91SAM9G10"
+        select SOC_AT91SAM9261
+
+config ARCH_AT91SAM9263
+        bool "AT91SAM9263"
+        select SOC_AT91SAM9263
+
+config ARCH_AT91SAM9RL
+        bool "AT91SAM9RL"
+        select SOC_AT91SAM9RL
+
+config ARCH_AT91SAM9G20
+        bool "AT91SAM9G20"
+        select SOC_AT91SAM9260
+
+config ARCH_AT91SAM9G45
+        bool "AT91SAM9G45"
+        select SOC_AT91SAM9G45
+
 config ARCH_AT91X40
         bool "AT91x40"
+        depends on !MMU
         select ARCH_USES_GETTIMEOFFSET
 
 endchoice