Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

[linux-2.6] / arch / arm / mach-pxa / Kconfig

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 619f6fc2bfe18b0306832e09f898a559100a0b1a..5da7a68204920c5c67a26f8003f80ffd168e48cc 100644 (file)
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -23,6 +23,12 @@ endif
 choice
        prompt "Select target board"
 
+config ARCH_GUMSTIX
+       bool "Gumstix XScale boards"
+       help
+         Say Y here if you intend to run this kernel on a
+         Gumstix Full Function Minature Computer.
+
 config ARCH_LUBBOCK
        bool "Intel DBPXA250 Development Platform"
        select PXA25x
@@ -103,10 +109,19 @@ config MACH_EM_X270
        bool "CompuLab EM-x270 platform"
        select PXA27x
 
+config MACH_COLIBRI
+       bool "Toradex Colibri PX27x"
+       select PXA27x
+
 config MACH_ZYLONITE
        bool "PXA3xx Development Platform"
        select PXA3xx
 
+config MACH_LITTLETON
+       bool "PXA3xx Form Factor Platform (aka Littleton)"
+       select PXA3xx
+       select PXA_SSP
+
 config MACH_ARMCORE
        bool "CompuLab CM-X270 modules"
        select PXA27x
@@ -118,6 +133,20 @@ config MACH_MAGICIAN
        select PXA27x
        select IWMMXT
 
+config MACH_PCM027
+       bool "Phytec phyCORE-PXA270 CPU module (PCM-027)"
+       select PXA27x
+       select IWMMXT
+
+endchoice
+
+choice
+       prompt "Used baseboard"
+       depends on MACH_PCM027
+
+config MACH_PCM990_BASEBOARD
+       bool "PHYTEC PCM-990 development board"
+
 endchoice
 
 if PXA_SHARPSL
@@ -137,6 +166,20 @@ endchoice
 
 endif
 
+if ARCH_GUMSTIX
+
+choice
+       prompt "Select target Gumstix board"
+
+config MACH_GUMSTIX_F
+       bool "Basix, Connex, ws-200ax, ws-400ax systems"
+       select PXA25x
+
+endchoice
+
+endif
+
+
 if MACH_TRIZEPS4
 
 choice