Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...

[linux-2.6-omap-h63xx.git] / arch / arm / mach-pxa / Kconfig

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 8627e718a6135f53c443bd88ec2304f5452b4f4b..8eea7306f29bc7bbe97e4b9657fbda59f5576a9b 100644 (file)
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -27,15 +27,26 @@ endmenu
 endif
 
 config ARCH_GUMSTIX
-       bool "Gumstix XScale boards"
+       bool "Gumstix XScale 255 boards"
+       select PXA25x
        help
-         Say Y here if you intend to run this kernel on a
-         Gumstix Full Function Minature Computer.
+         Say Y here if you intend to run this kernel on
+         Basix, Connex, ws-200ax, ws-400ax systems
 
-config MACH_GUMSTIX_F
-       bool "Basix, Connex, ws-200ax, ws-400ax systems"
+choice
+       prompt "Gumstix Carrier/Expansion Board"
        depends on ARCH_GUMSTIX
-       select PXA25x
+
+config GUMSTIX_AM200EPD
+       bool "Enable AM200EPD board support"
+
+endchoice
+
+config MACH_INTELMOTE2
+       bool "Intel Mote 2 Platform"
+       select PXA27x
+       select IWMMXT
+       select PXA_HAVE_BOARD_IRQS
 
 config ARCH_LUBBOCK
        bool "Intel DBPXA250 Development Platform"
@@ -348,10 +359,6 @@ config PCM990_DISPLAY_NONE
 
 endchoice
 
-config MACH_AM200EPD
-       depends on MACH_GUMSTIX_F
-       bool "Enable AM200EPD board support"
-
 config PXA_EZX
        bool "Motorola EZX Platform"
        select PXA27x
@@ -392,11 +399,13 @@ endmenu
 
 config PXA25x
        bool
+       select CPU_XSCALE
        help
          Select code specific to PXA21x/25x/26x variants
 
 config PXA27x
        bool
+       select CPU_XSCALE
        help
          Select code specific to PXA27x variants
 
@@ -408,6 +417,7 @@ config CPU_PXA26x
 
 config PXA3xx
        bool
+       select CPU_XSC3
        help
          Select code specific to PXA3xx variants