[ARM] pxa: re-order platforms in Kconfig and Makefile

Due to the naming mess in Kconfig and Makefile, I'd like to get them sorted
in the following order:

 1. By category:
    Intel/Marvell Dev Platforms, followed by 3rd party platforms, followed
    by end-user products (this is to ensure the commonly referenced platforms
    will appear first)

 2. By vendor name in alphabetic within each category
    (this is to ensure code reuse and similar platforms can be grouped as
     much as possible)

	   VENDOR        BOARD
	Intel/Marvell   Lubbock
	Intel/Marvell   Mainstone
	Intel/Marvell   Zylonite
	Intel/Marvell   Littleton
	Intel/Marvell   TavorEVB
	Intel/Marvell   SAAR

	Accelent        IDP
	Arcom/Eurotech  VIPER
	Community       Balloon3
	Cogent          CSB726
	CompuLab        EM_X270
	CompuLab        EXEDA
	CompuLab        ARMCORE
	CompuLab        CM_X300
	Gumstix         Gumstix
	Intel Research  MOTE2
	Intel research  Stargate2
	Iskratel        XCEP
	Keith and Koep  Trizeps4
	LogicPD         LPD270
	Phytec          PCM027
	Toradex         Colibri

	HP              HX4700
	HP              H5000
	HTC             Himalaya
	HTC             Magician
	Mitac           MioA701
	Motorola        EZX
	NEC             MP900C
	Palm            Palm PDA
	Palm            Palm GSM
	Sharp           Zaurus
	Toshiba         E-Series

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

1 files changed, 282 insertions, 276 deletions

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 28f0260777a3..e62572dc2d71 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -31,216 +31,144 @@ endmenu
 
 endif
 
-config ARCH_GUMSTIX
-        bool "Gumstix XScale 255 boards"
-        select PXA25x
-        help
-          Say Y here if you intend to run this kernel on
-          Basix, Connex, ws-200ax, ws-400ax systems
-
-choice
-        prompt "Gumstix Carrier/Expansion Board"
-        depends on ARCH_GUMSTIX
-
-config GUMSTIX_AM200EPD
-        bool "Enable AM200EPD board support"
-
-config GUMSTIX_AM300EPD
-        bool "Enable AM300EPD board support"
-
-endchoice
-
-config MACH_INTELMOTE2
-        bool "Intel Mote 2 Platform"
-        select PXA27x
-        select IWMMXT
-        select PXA_HAVE_BOARD_IRQS
-
-config MACH_STARGATE2
-        bool "Intel Stargate 2 Platform"
-        select PXA27x
-        select IWMMXT
-        select PXA_HAVE_BOARD_IRQS
+comment "Intel/Marvell Dev Platforms (sorted by hardware release time)"
 
 config ARCH_LUBBOCK
-        bool "Intel DBPXA250 Development Platform"
+        bool "Intel DBPXA250 Development Platform (aka Lubbock)"
         select PXA25x
         select SA1111
         select PXA_HAVE_BOARD_IRQS
 
-config MACH_LOGICPD_PXA270
-        bool "LogicPD PXA270 Card Engine Development Platform"
+config MACH_MAINSTONE
+        bool "Intel HCDDBBVA0 Development Platform (aka Mainstone)"
         select PXA27x
         select HAVE_PWM
         select PXA_HAVE_BOARD_IRQS
 
-config MACH_MAINSTONE
-        bool "Intel HCDDBBVA0 Development Platform"
-        select PXA27x
+config MACH_ZYLONITE
+        bool "PXA3xx Development Platform (aka Zylonite)"
+        select PXA3xx
+        select PXA_SSP
         select HAVE_PWM
         select PXA_HAVE_BOARD_IRQS
 
-config MACH_MP900C
-        bool "Nec Mobilepro 900/c"
+config MACH_LITTLETON
+        bool "PXA3xx Form Factor Platform (aka Littleton)"
+        select PXA3xx
+        select PXA_SSP
+
+config MACH_TAVOREVB
+        bool "PXA930 Evaluation Board (aka TavorEVB)"
+        select PXA3xx
+        select CPU_PXA930
+
+config MACH_SAAR
+        bool "PXA930 Handheld Platform (aka SAAR)"
+        select PXA3xx
+        select CPU_PXA930
+
+comment "Third Party Dev Platforms (sorted by vendor name)"
+
+config ARCH_PXA_IDP
+        bool "Accelent Xscale IDP"
         select PXA25x
 
+config ARCH_VIPER
+        bool "Arcom/Eurotech VIPER SBC"
+        select PXA25x
+        select ISA
+        select I2C_GPIO
+        select HAVE_PWM
+        select PXA_HAVE_BOARD_IRQS
+        select PXA_HAVE_ISA_IRQS
+
 config MACH_BALLOON3
         bool "Balloon 3 board"
         select PXA27x
         select IWMMXT
         select PXA_HAVE_BOARD_IRQS
 
-config ARCH_PXA_IDP
-        bool "Accelent Xscale IDP"
-        select PXA25x
-
-config PXA_SHARPSL
-        bool "SHARP Zaurus SL-5600, SL-C7xx and SL-Cxx00 Models"
-        select SHARP_SCOOP
-        select SHARP_PARAM
+config MACH_CSB726
+        bool "Enable Cogent CSB726 System On a Module"
+        select PXA27x
+        select IWMMXT
         help
-          Say Y here if you intend to run this kernel on a
-          Sharp Zaurus SL-5600 (Poodle), SL-C700 (Corgi),
-          SL-C750 (Shepherd), SL-C760 (Husky), SL-C1000 (Akita),
-          SL-C3000 (Spitz), SL-C3100 (Borzoi) or SL-C6000x (Tosa)
-          handheld computer.
-
-config SHARPSL_PM
-        bool
-        select APM_EMULATION
+          Say Y here if you intend to run this kernel on a Cogent
+          CSB726 System On Module.
 
-config CORGI_SSP_DEPRECATED
-        bool
-        select PXA_SSP
-        help
-          This option will include corgi_ssp.c and corgi_lcd.c
-          that corgi_ts.c and other legacy drivers (corgi_bl.c
-          and sharpsl_pm.c) may depend on.
+config CSB726_CSB701
+        bool "Enable support for CSB701 baseboard"
+        depends on MACH_CSB726
 
-config MACH_POODLE
-        bool "Enable Sharp SL-5600 (Poodle) Support"
-        depends on PXA_SHARPSL
+config MACH_ARMCORE
+        bool "CompuLab CM-X255/CM-X270 modules"
+        select PXA27x
+        select IWMMXT
         select PXA25x
-        select SHARP_LOCOMO
         select PXA_SSP
 
-config MACH_CORGI
-        bool "Enable Sharp SL-C700 (Corgi) Support"
-        depends on PXA_SHARPSL
-        select PXA25x
-        select PXA_SHARP_C7xx
-
-config MACH_SHEPHERD
-        bool "Enable Sharp SL-C750 (Shepherd) Support"
-        depends on PXA_SHARPSL
-        select PXA25x
-        select PXA_SHARP_C7xx
-
-config MACH_HUSKY
-        bool "Enable Sharp SL-C760 (Husky) Support"
-        depends on PXA_SHARPSL
-        select PXA25x
-        select PXA_SHARP_C7xx
-
-config MACH_AKITA
-        bool "Enable Sharp SL-1000 (Akita) Support"
-        depends on PXA_SHARPSL
-        select PXA27x
-        select PXA_SHARP_Cxx00
-        select MACH_SPITZ
-        select I2C
-        select I2C_PXA
-
-config MACH_SPITZ
-        bool "Enable Sharp Zaurus SL-3000 (Spitz) Support"
-        depends on PXA_SHARPSL
+config MACH_EM_X270
+        bool "CompuLab EM-x270 platform"
         select PXA27x
-        select PXA_SHARP_Cxx00
 
-config MACH_BORZOI
-        bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support"
-        depends on PXA_SHARPSL
+config MACH_EXEDA
+        bool "CompuLab eXeda platform"
         select PXA27x
-        select PXA_SHARP_Cxx00
 
-config MACH_TOSA
-        bool "Enable Sharp SL-6000x (Tosa) Support"
-        depends on PXA_SHARPSL
-        select PXA25x
-        select PXA_HAVE_BOARD_IRQS
+config MACH_CM_X300
+        bool "CompuLab CM-X300 modules"
+        select PXA3xx
+        select CPU_PXA300
 
-config ARCH_VIPER
-        bool "Arcom/Eurotech VIPER SBC"
+config ARCH_GUMSTIX
+        bool "Gumstix XScale 255 boards"
         select PXA25x
-        select ISA
-        select I2C_GPIO
-        select HAVE_PWM
-        select PXA_HAVE_BOARD_IRQS
-        select PXA_HAVE_ISA_IRQS
+        help
+          Say Y here if you intend to run this kernel on
+          Basix, Connex, ws-200ax, ws-400ax systems
 
-config ARCH_PXA_ESERIES
-        bool "PXA based Toshiba e-series PDAs"
-        select PXA25x
-        select PXA_HAVE_BOARD_IRQS
+choice
+        prompt "Gumstix Carrier/Expansion Board"
+        depends on ARCH_GUMSTIX
 
-config MACH_E330
-        bool "Toshiba e330"
-        default y
-        depends on ARCH_PXA_ESERIES
-        help
-          Say Y here if you intend to run this kernel on a Toshiba
-          e330 family PDA.
+config GUMSTIX_AM200EPD
+        bool "Enable AM200EPD board support"
 
-config MACH_E350
-        bool "Toshiba e350"
-        default y
-        depends on ARCH_PXA_ESERIES
-        help
-          Say Y here if you intend to run this kernel on a Toshiba
-          e350 family PDA.
+config GUMSTIX_AM300EPD
+        bool "Enable AM300EPD board support"
 
-config MACH_E740
-        bool "Toshiba e740"
-        default y
-        depends on ARCH_PXA_ESERIES
-        select FB_W100
-        help
-          Say Y here if you intend to run this kernel on a Toshiba
-          e740 family PDA.
+endchoice
 
-config MACH_E750
-        bool "Toshiba e750"
-        default y
-        depends on ARCH_PXA_ESERIES
-        select FB_W100
-        help
-          Say Y here if you intend to run this kernel on a Toshiba
-          e750 family PDA.
+config MACH_INTELMOTE2
+        bool "Intel Mote 2 Platform"
+        select PXA27x
+        select IWMMXT
+        select PXA_HAVE_BOARD_IRQS
 
-config MACH_E400
-        bool "Toshiba e400"
-        default y
-        depends on ARCH_PXA_ESERIES
-        help
-          Say Y here if you intend to run this kernel on a Toshiba
-          e400 family PDA.
+config MACH_STARGATE2
+        bool "Intel Stargate 2 Platform"
+        select PXA27x
+        select IWMMXT
+        select PXA_HAVE_BOARD_IRQS
 
-config MACH_E800
-        bool "Toshiba e800"
-        default y
-        depends on ARCH_PXA_ESERIES
-        select FB_W100
+config MACH_XCEP
+        bool "Iskratel Electronics XCEP"
+        select PXA25x
+        select MTD
+        select MTD_PARTITIONS
+        select MTD_PHYSMAP
+        select MTD_CFI_INTELEXT
+        select MTD_CFI
+        select MTD_CHAR
+        select SMC91X
+        select PXA_SSP
         help
-          Say Y here if you intend to run this kernel on a Toshiba
-          e800 family PDA.
+          PXA255 based Single Board Computer with SMC 91C111 ethernet chip and 64 MB of flash.
+          Tuned for usage in Libera instruments for particle accelerators.
 
 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
@@ -274,13 +202,38 @@ config TRIZEPS_PCMCIA
         help
           Enable PCMCIA support for Trizeps modules
 
-config MACH_EM_X270
-        bool "CompuLab EM-x270 platform"
+config MACH_LOGICPD_PXA270
+        bool "LogicPD PXA270 Card Engine Development Platform"
         select PXA27x
+        select HAVE_PWM
+        select PXA_HAVE_BOARD_IRQS
 
-config MACH_EXEDA
-        bool "CompuLab eXeda platform"
+config MACH_PCM027
+        bool "Phytec phyCORE-PXA270 CPU module (PCM-027)"
         select PXA27x
+        select IWMMXT
+        select PXA_SSP
+        select PXA_HAVE_BOARD_IRQS
+
+config MACH_PCM990_BASEBOARD
+        bool "PHYTEC PCM-990 development board"
+        select HAVE_PWM
+        depends on MACH_PCM027
+
+choice
+        prompt "display on pcm990"
+        depends on MACH_PCM990_BASEBOARD
+
+config PCM990_DISPLAY_SHARP
+        bool "sharp lq084v1dg21 stn display"
+
+config PCM990_DISPLAY_NEC
+        bool "nec nl6448bc20_18d tft display"
+
+config PCM990_DISPLAY_NONE
+        bool "no display"
+
+endchoice
 
 config MACH_COLIBRI
         bool "Toradex Colibri PXA270"
@@ -296,39 +249,7 @@ config MACH_COLIBRI320
         select PXA3xx
         select CPU_PXA320
 
-config MACH_ZYLONITE
-        bool "PXA3xx Development Platform (aka Zylonite)"
-        select PXA3xx
-        select PXA_SSP
-        select HAVE_PWM
-        select PXA_HAVE_BOARD_IRQS
-
-config MACH_LITTLETON
-        bool "PXA3xx Form Factor Platform (aka Littleton)"
-        select PXA3xx
-        select PXA_SSP
-
-config MACH_TAVOREVB
-        bool "PXA930 Evaluation Board (aka TavorEVB)"
-        select PXA3xx
-        select CPU_PXA930
-
-config MACH_SAAR
-        bool "PXA930 Handheld Platform (aka SAAR)"
-        select PXA3xx
-        select CPU_PXA930
-
-config MACH_ARMCORE
-        bool "CompuLab CM-X255/CM-X270 modules"
-        select PXA27x
-        select IWMMXT
-        select PXA25x
-        select PXA_SSP
-
-config MACH_CM_X300
-        bool "CompuLab CM-X300 modules"
-        select PXA3xx
-        select CPU_PXA300
+comment "End-user Products (sorted by vendor name)"
 
 config MACH_H4700
         bool "HP iPAQ hx4700"
@@ -338,6 +259,15 @@ config MACH_H4700
         select HAVE_PWM
         select PXA_HAVE_BOARD_IRQS
 
+config MACH_H5000
+        bool "HP iPAQ h5000"
+        select PXA25x
+
+config MACH_HIMALAYA
+        bool "HTC Himalaya Support"
+        select CPU_PXA26x
+        select FB_W100
+
 config MACH_MAGICIAN
         bool "Enable HTC Magician Support"
         select PXA27x
@@ -346,11 +276,6 @@ config MACH_MAGICIAN
         select HAVE_PWM
         select PXA_HAVE_BOARD_IRQS
 
-config MACH_HIMALAYA
-        bool "HTC Himalaya Support"
-        select CPU_PXA26x
-        select FB_W100
-
 config MACH_MIOA701
         bool "Mitac Mio A701 Support"
         select PXA27x
@@ -362,13 +287,47 @@ config MACH_MIOA701
           MIO A701. Currently there is only basic support
           for this PDA.
 
-config MACH_PCM027
-        bool "Phytec phyCORE-PXA270 CPU module (PCM-027)"
+config PXA_EZX
+        bool "Motorola EZX Platform"
         select PXA27x
         select IWMMXT
-        select PXA_SSP
+        select HAVE_PWM
         select PXA_HAVE_BOARD_IRQS
 
+config MACH_EZX_A780
+        bool "Motorola EZX A780"
+        default y
+        depends on PXA_EZX
+
+config MACH_EZX_E680
+        bool "Motorola EZX E680"
+        default y
+        depends on PXA_EZX
+
+config MACH_EZX_A1200
+        bool "Motorola EZX A1200"
+        default y
+        depends on PXA_EZX
+
+config MACH_EZX_A910
+        bool "Motorola EZX A910"
+        default y
+        depends on PXA_EZX
+
+config MACH_EZX_E6
+        bool "Motorola EZX E6"
+        default y
+        depends on PXA_EZX
+
+config MACH_EZX_E2
+        bool "Motorola EZX E2"
+        default y
+        depends on PXA_EZX
+
+config MACH_MP900C
+        bool "Nec Mobilepro 900/c"
+        select PXA25x
+
 config ARCH_PXA_PALM
         bool "PXA based Palm PDAs"
         select HAVE_PWM
@@ -421,6 +380,16 @@ config MACH_PALMZ72
           Say Y here if you intend to run this kernel on Palm Zire 72
           handheld computer.
 
+config MACH_PALMLD
+        bool "Palm LifeDrive"
+        default y
+        depends on ARCH_PXA_PALM
+        select PXA27x
+        select IWMMXT
+        help
+          Say Y here if you intend to run this kernel on a Palm LifeDrive
+          handheld computer.
+
 config PALM_TREO
         bool
         depends on ARCH_PXA_PALM
@@ -447,99 +416,136 @@ config MACH_TREO680
           Say Y here if you intend to run this kernel on Palm Treo 680
           smartphone.
 
-config MACH_PALMLD
-        bool "Palm LifeDrive"
-        default y
-        depends on ARCH_PXA_PALM
-        select PXA27x
-        select IWMMXT
+config PXA_SHARPSL
+        bool "SHARP Zaurus SL-5600, SL-C7xx and SL-Cxx00 Models"
+        select SHARP_SCOOP
+        select SHARP_PARAM
         help
-          Say Y here if you intend to run this kernel on a Palm LifeDrive
+          Say Y here if you intend to run this kernel on a
+          Sharp Zaurus SL-5600 (Poodle), SL-C700 (Corgi),
+          SL-C750 (Shepherd), SL-C760 (Husky), SL-C1000 (Akita),
+          SL-C3000 (Spitz), SL-C3100 (Borzoi) or SL-C6000x (Tosa)
           handheld computer.
 
-config MACH_PCM990_BASEBOARD
-        bool "PHYTEC PCM-990 development board"
-        select HAVE_PWM
-        depends on MACH_PCM027
+config SHARPSL_PM
+        bool
+        select APM_EMULATION
 
-choice
-        prompt "display on pcm990"
-        depends on MACH_PCM990_BASEBOARD
+config CORGI_SSP_DEPRECATED
+        bool
+        select PXA_SSP
+        help
+          This option will include corgi_ssp.c and corgi_lcd.c
+          that corgi_ts.c and other legacy drivers (corgi_bl.c
+          and sharpsl_pm.c) may depend on.
 
-config PCM990_DISPLAY_SHARP
-        bool "sharp lq084v1dg21 stn display"
+config MACH_POODLE
+        bool "Enable Sharp SL-5600 (Poodle) Support"
+        depends on PXA_SHARPSL
+        select PXA25x
+        select SHARP_LOCOMO
+        select PXA_SSP
 
-config PCM990_DISPLAY_NEC
-        bool "nec nl6448bc20_18d tft display"
+config MACH_CORGI
+        bool "Enable Sharp SL-C700 (Corgi) Support"
+        depends on PXA_SHARPSL
+        select PXA25x
+        select PXA_SHARP_C7xx
 
-config PCM990_DISPLAY_NONE
-        bool "no display"
+config MACH_SHEPHERD
+        bool "Enable Sharp SL-C750 (Shepherd) Support"
+        depends on PXA_SHARPSL
+        select PXA25x
+        select PXA_SHARP_C7xx
 
-endchoice
+config MACH_HUSKY
+        bool "Enable Sharp SL-C760 (Husky) Support"
+        depends on PXA_SHARPSL
+        select PXA25x
+        select PXA_SHARP_C7xx
 
-config MACH_CSB726
-        bool "Enable Cogent CSB726 System On a Module"
+config MACH_AKITA
+        bool "Enable Sharp SL-1000 (Akita) Support"
+        depends on PXA_SHARPSL
         select PXA27x
-        select IWMMXT
-        help
-          Say Y here if you intend to run this kernel on a Cogent
-          CSB726 System On Module.
+        select PXA_SHARP_Cxx00
+        select MACH_SPITZ
+        select I2C
+        select I2C_PXA
 
-config CSB726_CSB701
-        bool "Enable supprot for CSB701 baseboard"
-        depends on MACH_CSB726
+config MACH_SPITZ
+        bool "Enable Sharp Zaurus SL-3000 (Spitz) Support"
+        depends on PXA_SHARPSL
+        select PXA27x
+        select PXA_SHARP_Cxx00
 
-config PXA_EZX
-        bool "Motorola EZX Platform"
+config MACH_BORZOI
+        bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support"
+        depends on PXA_SHARPSL
         select PXA27x
-        select IWMMXT
-        select HAVE_PWM
+        select PXA_SHARP_Cxx00
+
+config MACH_TOSA
+        bool "Enable Sharp SL-6000x (Tosa) Support"
+        depends on PXA_SHARPSL
+        select PXA25x
         select PXA_HAVE_BOARD_IRQS
 
-config MACH_EZX_A780
-        bool "Motorola EZX A780"
-        default y
-        depends on PXA_EZX
+config ARCH_PXA_ESERIES
+        bool "PXA based Toshiba e-series PDAs"
+        select PXA25x
+        select PXA_HAVE_BOARD_IRQS
 
-config MACH_EZX_E680
-        bool "Motorola EZX E680"
+config MACH_E330
+        bool "Toshiba e330"
         default y
-        depends on PXA_EZX
+        depends on ARCH_PXA_ESERIES
+        help
+          Say Y here if you intend to run this kernel on a Toshiba
+          e330 family PDA.
 
-config MACH_EZX_A1200
-        bool "Motorola EZX A1200"
+config MACH_E350
+        bool "Toshiba e350"
         default y
-        depends on PXA_EZX
+        depends on ARCH_PXA_ESERIES
+        help
+          Say Y here if you intend to run this kernel on a Toshiba
+          e350 family PDA.
 
-config MACH_EZX_A910
-        bool "Motorola EZX A910"
+config MACH_E740
+        bool "Toshiba e740"
         default y
-        depends on PXA_EZX
+        depends on ARCH_PXA_ESERIES
+        select FB_W100
+        help
+          Say Y here if you intend to run this kernel on a Toshiba
+          e740 family PDA.
 
-config MACH_EZX_E6
-        bool "Motorola EZX E6"
+config MACH_E750
+        bool "Toshiba e750"
         default y
-        depends on PXA_EZX
+        depends on ARCH_PXA_ESERIES
+        select FB_W100
+        help
+          Say Y here if you intend to run this kernel on a Toshiba
+          e750 family PDA.
 
-config MACH_EZX_E2
-        bool "Motorola EZX E2"
+config MACH_E400
+        bool "Toshiba e400"
         default y
-        depends on PXA_EZX
+        depends on ARCH_PXA_ESERIES
+        help
+          Say Y here if you intend to run this kernel on a Toshiba
+          e400 family PDA.
 
-config MACH_XCEP
-        bool "Iskratel Electronics XCEP"
-        select PXA25x
-        select MTD
-        select MTD_PARTITIONS
-        select MTD_PHYSMAP
-        select MTD_CFI_INTELEXT
-        select MTD_CFI
-        select MTD_CHAR
-        select SMC91X
-        select PXA_SSP
+config MACH_E800
+        bool "Toshiba e800"
+        default y
+        depends on ARCH_PXA_ESERIES
+        select FB_W100
         help
-          PXA255 based Single Board Computer with SMC 91C111 ethernet chip and 64 MB of flash.
-          Tuned for usage in Libera instruments for particle accelerators.
+          Say Y here if you intend to run this kernel on a Toshiba
+          e800 family PDA.
 
 endmenu