Merge tag 'at91-cleanup3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre...

[pandora-kernel.git] / arch / arm / mach-prima2 / Kconfig

diff --git a/arch/arm/mach-prima2/Kconfig b/arch/arm/mach-prima2/Kconfig
index 042f693..a219dc3 100644 (file)
--- a/arch/arm/mach-prima2/Kconfig
+++ b/arch/arm/mach-prima2/Kconfig
@@ -11,7 +11,7 @@ menuconfig ARCH_SIRF
 
 if ARCH_SIRF
 
-comment "CSR SiRF atlas6/primaII/Marco/Polo Specific Features"
+comment "CSR SiRF atlas6/primaII/Atlas7 Specific Features"
 
 config ARCH_ATLAS6
        bool "CSR SiRFSoC ATLAS6 ARM Cortex A9 Platform"
@@ -20,6 +20,17 @@ config ARCH_ATLAS6
        help
           Support for CSR SiRFSoC ARM Cortex A9 Platform
 
+config ARCH_ATLAS7
+       bool "CSR SiRFSoC ATLAS7 ARM Cortex A7 Platform"
+       default y
+       select ARM_GIC
+       select CPU_V7
+       select HAVE_ARM_SCU if SMP
+       select HAVE_SMP
+       select SMP_ON_UP if SMP
+       help
+          Support for CSR SiRFSoC ARM Cortex A7 Platform
+
 config ARCH_PRIMA2
        bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform"
        default y
@@ -28,15 +39,6 @@ config ARCH_PRIMA2
        help
           Support for CSR SiRFSoC ARM Cortex A9 Platform
 
-config ARCH_MARCO
-       bool "CSR SiRFSoC MARCO ARM Cortex A9 Platform"
-       default y
-       select ARM_GIC
-       select HAVE_ARM_SCU if SMP
-       select SMP_ON_UP if SMP
-       help
-          Support for CSR SiRFSoC ARM Cortex A9 Platform
-
 config SIRF_IRQ
        bool