1 files changed, 52 insertions, 28 deletions

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 3b51741a4810..7aefb9074852 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -238,6 +238,17 @@ config MACH_COLIBRI
         bool "Toradex Colibri PXA270"
         select PXA27x
 
+config MACH_COLIBRI_PXA270_EVALBOARD
+        bool "Toradex Colibri Evaluation Carrier Board support (PXA270)"
+        depends on MACH_COLIBRI
+
+config MACH_COLIBRI_PXA270_INCOME
+        bool "Income s.r.o. PXA270 SBC"
+        depends on MACH_COLIBRI
+        select PXA27x
+        select HAVE_PWM
+        select PXA_HAVE_BOARD_IRQS
+
 config MACH_COLIBRI300
         bool "Toradex Colibri PXA300/310"
         select PXA3xx
@@ -336,6 +347,9 @@ config ARCH_PXA_PALM
         bool "PXA based Palm PDAs"
         select HAVE_PWM
 
+config MACH_PALM27X
+        bool
+
 config MACH_PALMTE2
         bool "Palm Tungsten|E2"
         default y
@@ -360,6 +374,7 @@ config MACH_PALMT5
         depends on ARCH_PXA_PALM
         select PXA27x
         select IWMMXT
+        select MACH_PALM27X
         help
           Say Y here if you intend to run this kernel on a Palm Tungsten|T5
           handheld computer.
@@ -370,6 +385,7 @@ config MACH_PALMTX
         depends on ARCH_PXA_PALM
         select PXA27x
         select IWMMXT
+        select MACH_PALM27X
         help
           Say Y here if you intend to run this kernel on a Palm T|X
           handheld computer.
@@ -380,6 +396,7 @@ config MACH_PALMZ72
         depends on ARCH_PXA_PALM
         select PXA27x
         select IWMMXT
+        select MACH_PALM27X
         help
           Say Y here if you intend to run this kernel on Palm Zire 72
           handheld computer.
@@ -390,6 +407,7 @@ config MACH_PALMLD
         depends on ARCH_PXA_PALM
         select PXA27x
         select IWMMXT
+        select MACH_PALM27X
         help
           Say Y here if you intend to run this kernel on a Palm LifeDrive
           handheld computer.
@@ -447,16 +465,13 @@ config PXA_SHARPSL
           SL-C3000 (Spitz), SL-C3100 (Borzoi) or SL-C6000x (Tosa)
           handheld computer.
 
-config SHARPSL_PM
-        bool
-        select APM_EMULATION
-        select SHARPSL_PM_MAX1111
-
-config SHARPSL_PM_MAX1111
-        bool
-        depends on !CORGI_SSP_DEPRECATED
-        select HWMON
-        select SENSORS_MAX1111
+config PXA_SHARPSL_DETECT_MACH_ID
+        bool "Detect machine ID at run-time in the decompressor"
+        depends on PXA_SHARPSL
+        help
+          Say Y here if you want the zImage decompressor to detect
+          the Zaurus machine ID at run-time. For latest kexec-based
+          boot loader, this is not necessary.
 
 config MACH_POODLE
         bool "Enable Sharp SL-5600 (Poodle) Support"
@@ -510,6 +525,25 @@ config MACH_TOSA
         select PXA25x
         select PXA_HAVE_BOARD_IRQS
 
+config TOSA_BT
+        tristate "Control the state of built-in bluetooth chip on Sharp SL-6000"
+        depends on MACH_TOSA
+        select RFKILL
+        help
+          This is a simple driver that is able to control
+          the state of built in bluetooth chip on tosa.
+
+config TOSA_USE_EXT_KEYCODES
+        bool "Tosa keyboard: use extended keycodes"
+        depends on MACH_TOSA
+        default n
+        help
+          Say Y here to enable the tosa keyboard driver to generate extended
+          (>= 127) keycodes. Be aware, that they can't be correctly interpreted
+          by either console keyboard driver or by Kdrive keybd driver.
+
+          Say Y only if you know, what you are doing!
+
 config MACH_ICONTROL
         bool "TMT iControl/SafeTCam based on the MXM-8x10 CoM"
         select CPU_PXA320
@@ -648,25 +682,15 @@ config PXA_SHARP_Cxx00
         help
           Enable common support for Sharp Cxx00 models
 
-config TOSA_BT
-        tristate "Control the state of built-in bluetooth chip on Sharp SL-6000"
-        depends on MACH_TOSA
-        select RFKILL
-        help
-          This is a simple driver that is able to control
-          the state of built in bluetooth chip on tosa.
-
-config TOSA_USE_EXT_KEYCODES
-        bool "Tosa keyboard: use extended keycodes"
-        depends on MACH_TOSA
-        default n
-        help
-          Say Y here to enable the tosa keyboard driver to generate extended
-          (>= 127) keycodes. Be aware, that they can't be correctly interpreted
-          by either console keyboard driver or by Kdrive keybd driver.
-
-          Say Y only if you know, what you are doing!
+config SHARPSL_PM
+        bool
+        select APM_EMULATION
+        select SHARPSL_PM_MAX1111
 
+config SHARPSL_PM_MAX1111
+        bool
+        select HWMON
+        select SENSORS_MAX1111
 
 config PXA_HAVE_BOARD_IRQS
         bool