Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

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

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index ea5137f..656d496 100644 (file)
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -1,6 +1,24 @@
 if ARCH_PXA
 
-menu "Intel PXA2xx Implementations"
+menu "Intel PXA2xx/PXA3xx Implementations"
+
+if PXA3xx
+
+menu "Supported PXA3xx Processor Variants"
+
+config CPU_PXA300
+       bool "PXA300 (codename Monahans-L)"
+
+config CPU_PXA310
+       bool "PXA310 (codename Monahans-LV)"
+       select CPU_PXA300
+
+config CPU_PXA320
+       bool "PXA320 (codename Monahans-P)"
+
+endmenu
+
+endif
 
 choice
        prompt "Select target board"
@@ -13,12 +31,10 @@ config ARCH_LUBBOCK
 config MACH_LOGICPD_PXA270
        bool "LogicPD PXA270 Card Engine Development Platform"
        select PXA27x
-       select IWMMXT
 
 config MACH_MAINSTONE
        bool "Intel HCDDBBVA0 Development Platform"
        select PXA27x
-       select IWMMXT
 
 config ARCH_PXA_IDP
        bool "Accelent Xscale IDP"
@@ -35,6 +51,23 @@ config PXA_SHARPSL
          SL-C3000 (Spitz), SL-C3100 (Borzoi) or SL-C6000x (Tosa)
          handheld computer.
 
+config MACH_TRIZEPS4
+       bool "Keith und Koep Trizeps4 DIMM-Module"
+       select PXA27x
+
+config MACH_EM_X270
+       bool "CompuLab EM-x270 platform"
+       select PXA27x
+
+config MACH_ZYLONITE
+       bool "PXA3xx Development Platform"
+       select PXA3xx
+
+config MACH_ARMCORE
+       bool "CompuLab CM-X270 modules"
+       select PXA27x
+       select IWMMXT
+
 endchoice
 
 if PXA_SHARPSL
@@ -49,7 +82,21 @@ config PXA_SHARPSL_25x
 config PXA_SHARPSL_27x
        bool "Sharp PXA270 models (SL-Cxx00)"
        select PXA27x
-       select IWMMXT
+
+endchoice
+
+endif
+
+if MACH_TRIZEPS4
+
+choice
+       prompt "Select base board for Trizeps 4 module"
+
+config MACH_TRIZEPS4_CONXS
+       bool "ConXS Eval Board"
+
+config MACH_TRIZEPS4_ANY
+       bool "another Board"
 
 endchoice
 
@@ -59,28 +106,28 @@ endmenu
 
 config MACH_POODLE
        bool "Enable Sharp SL-5600 (Poodle) Support"
-       depends PXA_SHARPSL_25x
+       depends on PXA_SHARPSL_25x
        select SHARP_LOCOMO
        select PXA_SSP
 
 config MACH_CORGI
        bool "Enable Sharp SL-C700 (Corgi) Support"
-       depends PXA_SHARPSL_25x
+       depends on PXA_SHARPSL_25x
        select PXA_SHARP_C7xx
 
 config MACH_SHEPHERD
        bool "Enable Sharp SL-C750 (Shepherd) Support"
-       depends PXA_SHARPSL_25x
+       depends on PXA_SHARPSL_25x
        select PXA_SHARP_C7xx
 
 config MACH_HUSKY
        bool "Enable Sharp SL-C760 (Husky) Support"
-       depends PXA_SHARPSL_25x
+       depends on PXA_SHARPSL_25x
        select PXA_SHARP_C7xx
 
 config MACH_AKITA
        bool "Enable Sharp SL-1000 (Akita) Support"
-       depends PXA_SHARPSL_27x
+       depends on PXA_SHARPSL_27x
        select PXA_SHARP_Cxx00
        select MACH_SPITZ
        select I2C
@@ -88,17 +135,17 @@ config MACH_AKITA
 
 config MACH_SPITZ
        bool "Enable Sharp Zaurus SL-3000 (Spitz) Support"
-       depends PXA_SHARPSL_27x
+       depends on PXA_SHARPSL_27x
        select PXA_SHARP_Cxx00
 
 config MACH_BORZOI
        bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support"
-       depends PXA_SHARPSL_27x
+       depends on PXA_SHARPSL_27x
        select PXA_SHARP_Cxx00
 
 config MACH_TOSA
        bool "Enable Sharp SL-6000x (Tosa) Support"
-       depends PXA_SHARPSL_25x
+       depends on PXA_SHARPSL_25x
 
 config PXA25x
        bool
@@ -110,10 +157,10 @@ config PXA27x
        help
          Select code specific to PXA27x variants
 
-config IWMMXT
+config PXA3xx
        bool
        help
-         Enable support for iWMMXt
+         Select code specific to PXA3xx variants
 
 config PXA_SHARP_C7xx
        bool