1 files changed, 33 insertions, 11 deletions

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index a062235e83a8..8eea7306f29b 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -19,20 +19,34 @@ config CPU_PXA320
 config CPU_PXA930
         bool "PXA930 (codename Tavor-P)"
 
+config CPU_PXA935
+        bool "PXA935 (codename Tavor-P65)"
+
 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"
@@ -199,6 +213,10 @@ config MACH_E800
 config TRIZEPS_PXA
         bool "PXA based Keith und Koep Trizeps DIMM-Modules"
 
+config MACH_H5000
+        bool "HP iPAQ h5000"
+        select PXA25x
+
 config MACH_TRIZEPS4
         bool "Keith und Koep Trizeps4 DIMM-Module"
         depends on TRIZEPS_PXA
@@ -283,7 +301,6 @@ config MACH_MIOA701
         bool "Mitac Mio A701 Support"
         select PXA27x
         select IWMMXT
-        select LEDS_GPIO
         select HAVE_PWM
         select GPIO_SYSFS
         help
@@ -342,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
@@ -386,16 +399,25 @@ 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
 
+config CPU_PXA26x
+        bool
+        select PXA25x
+        help
+          Select code specific to PXA26x (codename Dalhart)
+
 config PXA3xx
         bool
+        select CPU_XSC3
         help
           Select code specific to PXA3xx variants