diff options
author | Eric Miao <eric.y.miao@gmail.com> | 2009-10-11 21:32:07 -0400 |
---|---|---|
committer | Eric Miao <eric.y.miao@gmail.com> | 2009-11-30 20:02:50 -0500 |
commit | de0710aa81a4663feb4a039973f96cb7a7661496 (patch) | |
tree | af4772ddedeb4f2981f64d84c78c8b89dec03704 /arch/arm/mach-pxa | |
parent | d0a92fd3b84bf707f6b32f31d0f09d2b7bb1ad67 (diff) |
[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>
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r-- | arch/arm/mach-pxa/Kconfig | 558 | ||||
-rw-r--r-- | arch/arm/mach-pxa/Makefile | 93 |
2 files changed, 329 insertions, 322 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 | |||
31 | 31 | ||
32 | endif | 32 | endif |
33 | 33 | ||
34 | config ARCH_GUMSTIX | 34 | comment "Intel/Marvell Dev Platforms (sorted by hardware release time)" |
35 | bool "Gumstix XScale 255 boards" | ||
36 | select PXA25x | ||
37 | help | ||
38 | Say Y here if you intend to run this kernel on | ||
39 | Basix, Connex, ws-200ax, ws-400ax systems | ||
40 | |||
41 | choice | ||
42 | prompt "Gumstix Carrier/Expansion Board" | ||
43 | depends on ARCH_GUMSTIX | ||
44 | |||
45 | config GUMSTIX_AM200EPD | ||
46 | bool "Enable AM200EPD board support" | ||
47 | |||
48 | config GUMSTIX_AM300EPD | ||
49 | bool "Enable AM300EPD board support" | ||
50 | |||
51 | endchoice | ||
52 | |||
53 | config MACH_INTELMOTE2 | ||
54 | bool "Intel Mote 2 Platform" | ||
55 | select PXA27x | ||
56 | select IWMMXT | ||
57 | select PXA_HAVE_BOARD_IRQS | ||
58 | |||
59 | config MACH_STARGATE2 | ||
60 | bool "Intel Stargate 2 Platform" | ||
61 | select PXA27x | ||
62 | select IWMMXT | ||
63 | select PXA_HAVE_BOARD_IRQS | ||
64 | 35 | ||
65 | config ARCH_LUBBOCK | 36 | config ARCH_LUBBOCK |
66 | bool "Intel DBPXA250 Development Platform" | 37 | bool "Intel DBPXA250 Development Platform (aka Lubbock)" |
67 | select PXA25x | 38 | select PXA25x |
68 | select SA1111 | 39 | select SA1111 |
69 | select PXA_HAVE_BOARD_IRQS | 40 | select PXA_HAVE_BOARD_IRQS |
70 | 41 | ||
71 | config MACH_LOGICPD_PXA270 | 42 | config MACH_MAINSTONE |
72 | bool "LogicPD PXA270 Card Engine Development Platform" | 43 | bool "Intel HCDDBBVA0 Development Platform (aka Mainstone)" |
73 | select PXA27x | 44 | select PXA27x |
74 | select HAVE_PWM | 45 | select HAVE_PWM |
75 | select PXA_HAVE_BOARD_IRQS | 46 | select PXA_HAVE_BOARD_IRQS |
76 | 47 | ||
77 | config MACH_MAINSTONE | 48 | config MACH_ZYLONITE |
78 | bool "Intel HCDDBBVA0 Development Platform" | 49 | bool "PXA3xx Development Platform (aka Zylonite)" |
79 | select PXA27x | 50 | select PXA3xx |
51 | select PXA_SSP | ||
80 | select HAVE_PWM | 52 | select HAVE_PWM |
81 | select PXA_HAVE_BOARD_IRQS | 53 | select PXA_HAVE_BOARD_IRQS |
82 | 54 | ||
83 | config MACH_MP900C | 55 | config MACH_LITTLETON |
84 | bool "Nec Mobilepro 900/c" | 56 | bool "PXA3xx Form Factor Platform (aka Littleton)" |
57 | select PXA3xx | ||
58 | select PXA_SSP | ||
59 | |||
60 | config MACH_TAVOREVB | ||
61 | bool "PXA930 Evaluation Board (aka TavorEVB)" | ||
62 | select PXA3xx | ||
63 | select CPU_PXA930 | ||
64 | |||
65 | config MACH_SAAR | ||
66 | bool "PXA930 Handheld Platform (aka SAAR)" | ||
67 | select PXA3xx | ||
68 | select CPU_PXA930 | ||
69 | |||
70 | comment "Third Party Dev Platforms (sorted by vendor name)" | ||
71 | |||
72 | config ARCH_PXA_IDP | ||
73 | bool "Accelent Xscale IDP" | ||
85 | select PXA25x | 74 | select PXA25x |
86 | 75 | ||
76 | config ARCH_VIPER | ||
77 | bool "Arcom/Eurotech VIPER SBC" | ||
78 | select PXA25x | ||
79 | select ISA | ||
80 | select I2C_GPIO | ||
81 | select HAVE_PWM | ||
82 | select PXA_HAVE_BOARD_IRQS | ||
83 | select PXA_HAVE_ISA_IRQS | ||
84 | |||
87 | config MACH_BALLOON3 | 85 | config MACH_BALLOON3 |
88 | bool "Balloon 3 board" | 86 | bool "Balloon 3 board" |
89 | select PXA27x | 87 | select PXA27x |
90 | select IWMMXT | 88 | select IWMMXT |
91 | select PXA_HAVE_BOARD_IRQS | 89 | select PXA_HAVE_BOARD_IRQS |
92 | 90 | ||
93 | config ARCH_PXA_IDP | 91 | config MACH_CSB726 |
94 | bool "Accelent Xscale IDP" | 92 | bool "Enable Cogent CSB726 System On a Module" |
95 | select PXA25x | 93 | select PXA27x |
96 | 94 | select IWMMXT | |
97 | config PXA_SHARPSL | ||
98 | bool "SHARP Zaurus SL-5600, SL-C7xx and SL-Cxx00 Models" | ||
99 | select SHARP_SCOOP | ||
100 | select SHARP_PARAM | ||
101 | help | 95 | help |
102 | Say Y here if you intend to run this kernel on a | 96 | Say Y here if you intend to run this kernel on a Cogent |
103 | Sharp Zaurus SL-5600 (Poodle), SL-C700 (Corgi), | 97 | CSB726 System On Module. |
104 | SL-C750 (Shepherd), SL-C760 (Husky), SL-C1000 (Akita), | ||
105 | SL-C3000 (Spitz), SL-C3100 (Borzoi) or SL-C6000x (Tosa) | ||
106 | handheld computer. | ||
107 | |||
108 | config SHARPSL_PM | ||
109 | bool | ||
110 | select APM_EMULATION | ||
111 | 98 | ||
112 | config CORGI_SSP_DEPRECATED | 99 | config CSB726_CSB701 |
113 | bool | 100 | bool "Enable support for CSB701 baseboard" |
114 | select PXA_SSP | 101 | depends on MACH_CSB726 |
115 | help | ||
116 | This option will include corgi_ssp.c and corgi_lcd.c | ||
117 | that corgi_ts.c and other legacy drivers (corgi_bl.c | ||
118 | and sharpsl_pm.c) may depend on. | ||
119 | 102 | ||
120 | config MACH_POODLE | 103 | config MACH_ARMCORE |
121 | bool "Enable Sharp SL-5600 (Poodle) Support" | 104 | bool "CompuLab CM-X255/CM-X270 modules" |
122 | depends on PXA_SHARPSL | 105 | select PXA27x |
106 | select IWMMXT | ||
123 | select PXA25x | 107 | select PXA25x |
124 | select SHARP_LOCOMO | ||
125 | select PXA_SSP | 108 | select PXA_SSP |
126 | 109 | ||
127 | config MACH_CORGI | 110 | config MACH_EM_X270 |
128 | bool "Enable Sharp SL-C700 (Corgi) Support" | 111 | bool "CompuLab EM-x270 platform" |
129 | depends on PXA_SHARPSL | ||
130 | select PXA25x | ||
131 | select PXA_SHARP_C7xx | ||
132 | |||
133 | config MACH_SHEPHERD | ||
134 | bool "Enable Sharp SL-C750 (Shepherd) Support" | ||
135 | depends on PXA_SHARPSL | ||
136 | select PXA25x | ||
137 | select PXA_SHARP_C7xx | ||
138 | |||
139 | config MACH_HUSKY | ||
140 | bool "Enable Sharp SL-C760 (Husky) Support" | ||
141 | depends on PXA_SHARPSL | ||
142 | select PXA25x | ||
143 | select PXA_SHARP_C7xx | ||
144 | |||
145 | config MACH_AKITA | ||
146 | bool "Enable Sharp SL-1000 (Akita) Support" | ||
147 | depends on PXA_SHARPSL | ||
148 | select PXA27x | ||
149 | select PXA_SHARP_Cxx00 | ||
150 | select MACH_SPITZ | ||
151 | select I2C | ||
152 | select I2C_PXA | ||
153 | |||
154 | config MACH_SPITZ | ||
155 | bool "Enable Sharp Zaurus SL-3000 (Spitz) Support" | ||
156 | depends on PXA_SHARPSL | ||
157 | select PXA27x | 112 | select PXA27x |
158 | select PXA_SHARP_Cxx00 | ||
159 | 113 | ||
160 | config MACH_BORZOI | 114 | config MACH_EXEDA |
161 | bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support" | 115 | bool "CompuLab eXeda platform" |
162 | depends on PXA_SHARPSL | ||
163 | select PXA27x | 116 | select PXA27x |
164 | select PXA_SHARP_Cxx00 | ||
165 | 117 | ||
166 | config MACH_TOSA | 118 | config MACH_CM_X300 |
167 | bool "Enable Sharp SL-6000x (Tosa) Support" | 119 | bool "CompuLab CM-X300 modules" |
168 | depends on PXA_SHARPSL | 120 | select PXA3xx |
169 | select PXA25x | 121 | select CPU_PXA300 |
170 | select PXA_HAVE_BOARD_IRQS | ||
171 | 122 | ||
172 | config ARCH_VIPER | 123 | config ARCH_GUMSTIX |
173 | bool "Arcom/Eurotech VIPER SBC" | 124 | bool "Gumstix XScale 255 boards" |
174 | select PXA25x | 125 | select PXA25x |
175 | select ISA | 126 | help |
176 | select I2C_GPIO | 127 | Say Y here if you intend to run this kernel on |
177 | select HAVE_PWM | 128 | Basix, Connex, ws-200ax, ws-400ax systems |
178 | select PXA_HAVE_BOARD_IRQS | ||
179 | select PXA_HAVE_ISA_IRQS | ||
180 | 129 | ||
181 | config ARCH_PXA_ESERIES | 130 | choice |
182 | bool "PXA based Toshiba e-series PDAs" | 131 | prompt "Gumstix Carrier/Expansion Board" |
183 | select PXA25x | 132 | depends on ARCH_GUMSTIX |
184 | select PXA_HAVE_BOARD_IRQS | ||
185 | 133 | ||
186 | config MACH_E330 | 134 | config GUMSTIX_AM200EPD |
187 | bool "Toshiba e330" | 135 | bool "Enable AM200EPD board support" |
188 | default y | ||
189 | depends on ARCH_PXA_ESERIES | ||
190 | help | ||
191 | Say Y here if you intend to run this kernel on a Toshiba | ||
192 | e330 family PDA. | ||
193 | 136 | ||
194 | config MACH_E350 | 137 | config GUMSTIX_AM300EPD |
195 | bool "Toshiba e350" | 138 | bool "Enable AM300EPD board support" |
196 | default y | ||
197 | depends on ARCH_PXA_ESERIES | ||
198 | help | ||
199 | Say Y here if you intend to run this kernel on a Toshiba | ||
200 | e350 family PDA. | ||
201 | 139 | ||
202 | config MACH_E740 | 140 | endchoice |
203 | bool "Toshiba e740" | ||
204 | default y | ||
205 | depends on ARCH_PXA_ESERIES | ||
206 | select FB_W100 | ||
207 | help | ||
208 | Say Y here if you intend to run this kernel on a Toshiba | ||
209 | e740 family PDA. | ||
210 | 141 | ||
211 | config MACH_E750 | 142 | config MACH_INTELMOTE2 |
212 | bool "Toshiba e750" | 143 | bool "Intel Mote 2 Platform" |
213 | default y | 144 | select PXA27x |
214 | depends on ARCH_PXA_ESERIES | 145 | select IWMMXT |
215 | select FB_W100 | 146 | select PXA_HAVE_BOARD_IRQS |
216 | help | ||
217 | Say Y here if you intend to run this kernel on a Toshiba | ||
218 | e750 family PDA. | ||
219 | 147 | ||
220 | config MACH_E400 | 148 | config MACH_STARGATE2 |
221 | bool "Toshiba e400" | 149 | bool "Intel Stargate 2 Platform" |
222 | default y | 150 | select PXA27x |
223 | depends on ARCH_PXA_ESERIES | 151 | select IWMMXT |
224 | help | 152 | select PXA_HAVE_BOARD_IRQS |
225 | Say Y here if you intend to run this kernel on a Toshiba | ||
226 | e400 family PDA. | ||
227 | 153 | ||
228 | config MACH_E800 | 154 | config MACH_XCEP |
229 | bool "Toshiba e800" | 155 | bool "Iskratel Electronics XCEP" |
230 | default y | 156 | select PXA25x |
231 | depends on ARCH_PXA_ESERIES | 157 | select MTD |
232 | select FB_W100 | 158 | select MTD_PARTITIONS |
159 | select MTD_PHYSMAP | ||
160 | select MTD_CFI_INTELEXT | ||
161 | select MTD_CFI | ||
162 | select MTD_CHAR | ||
163 | select SMC91X | ||
164 | select PXA_SSP | ||
233 | help | 165 | help |
234 | Say Y here if you intend to run this kernel on a Toshiba | 166 | PXA255 based Single Board Computer with SMC 91C111 ethernet chip and 64 MB of flash. |
235 | e800 family PDA. | 167 | Tuned for usage in Libera instruments for particle accelerators. |
236 | 168 | ||
237 | config TRIZEPS_PXA | 169 | config TRIZEPS_PXA |
238 | bool "PXA based Keith und Koep Trizeps DIMM-Modules" | 170 | bool "PXA based Keith und Koep Trizeps DIMM-Modules" |
239 | 171 | ||
240 | config MACH_H5000 | ||
241 | bool "HP iPAQ h5000" | ||
242 | select PXA25x | ||
243 | |||
244 | config MACH_TRIZEPS4 | 172 | config MACH_TRIZEPS4 |
245 | bool "Keith und Koep Trizeps4 DIMM-Module" | 173 | bool "Keith und Koep Trizeps4 DIMM-Module" |
246 | depends on TRIZEPS_PXA | 174 | depends on TRIZEPS_PXA |
@@ -274,13 +202,38 @@ config TRIZEPS_PCMCIA | |||
274 | help | 202 | help |
275 | Enable PCMCIA support for Trizeps modules | 203 | Enable PCMCIA support for Trizeps modules |
276 | 204 | ||
277 | config MACH_EM_X270 | 205 | config MACH_LOGICPD_PXA270 |
278 | bool "CompuLab EM-x270 platform" | 206 | bool "LogicPD PXA270 Card Engine Development Platform" |
279 | select PXA27x | 207 | select PXA27x |
208 | select HAVE_PWM | ||
209 | select PXA_HAVE_BOARD_IRQS | ||
280 | 210 | ||
281 | config MACH_EXEDA | 211 | config MACH_PCM027 |
282 | bool "CompuLab eXeda platform" | 212 | bool "Phytec phyCORE-PXA270 CPU module (PCM-027)" |
283 | select PXA27x | 213 | select PXA27x |
214 | select IWMMXT | ||
215 | select PXA_SSP | ||
216 | select PXA_HAVE_BOARD_IRQS | ||
217 | |||
218 | config MACH_PCM990_BASEBOARD | ||
219 | bool "PHYTEC PCM-990 development board" | ||
220 | select HAVE_PWM | ||
221 | depends on MACH_PCM027 | ||
222 | |||
223 | choice | ||
224 | prompt "display on pcm990" | ||
225 | depends on MACH_PCM990_BASEBOARD | ||
226 | |||
227 | config PCM990_DISPLAY_SHARP | ||
228 | bool "sharp lq084v1dg21 stn display" | ||
229 | |||
230 | config PCM990_DISPLAY_NEC | ||
231 | bool "nec nl6448bc20_18d tft display" | ||
232 | |||
233 | config PCM990_DISPLAY_NONE | ||
234 | bool "no display" | ||
235 | |||
236 | endchoice | ||
284 | 237 | ||
285 | config MACH_COLIBRI | 238 | config MACH_COLIBRI |
286 | bool "Toradex Colibri PXA270" | 239 | bool "Toradex Colibri PXA270" |
@@ -296,39 +249,7 @@ config MACH_COLIBRI320 | |||
296 | select PXA3xx | 249 | select PXA3xx |
297 | select CPU_PXA320 | 250 | select CPU_PXA320 |
298 | 251 | ||
299 | config MACH_ZYLONITE | 252 | comment "End-user Products (sorted by vendor name)" |
300 | bool "PXA3xx Development Platform (aka Zylonite)" | ||
301 | select PXA3xx | ||
302 | select PXA_SSP | ||
303 | select HAVE_PWM | ||
304 | select PXA_HAVE_BOARD_IRQS | ||
305 | |||
306 | config MACH_LITTLETON | ||
307 | bool "PXA3xx Form Factor Platform (aka Littleton)" | ||
308 | select PXA3xx | ||
309 | select PXA_SSP | ||
310 | |||
311 | config MACH_TAVOREVB | ||
312 | bool "PXA930 Evaluation Board (aka TavorEVB)" | ||
313 | select PXA3xx | ||
314 | select CPU_PXA930 | ||
315 | |||
316 | config MACH_SAAR | ||
317 | bool "PXA930 Handheld Platform (aka SAAR)" | ||
318 | select PXA3xx | ||
319 | select CPU_PXA930 | ||
320 | |||
321 | config MACH_ARMCORE | ||
322 | bool "CompuLab CM-X255/CM-X270 modules" | ||
323 | select PXA27x | ||
324 | select IWMMXT | ||
325 | select PXA25x | ||
326 | select PXA_SSP | ||
327 | |||
328 | config MACH_CM_X300 | ||
329 | bool "CompuLab CM-X300 modules" | ||
330 | select PXA3xx | ||
331 | select CPU_PXA300 | ||
332 | 253 | ||
333 | config MACH_H4700 | 254 | config MACH_H4700 |
334 | bool "HP iPAQ hx4700" | 255 | bool "HP iPAQ hx4700" |
@@ -338,6 +259,15 @@ config MACH_H4700 | |||
338 | select HAVE_PWM | 259 | select HAVE_PWM |
339 | select PXA_HAVE_BOARD_IRQS | 260 | select PXA_HAVE_BOARD_IRQS |
340 | 261 | ||
262 | config MACH_H5000 | ||
263 | bool "HP iPAQ h5000" | ||
264 | select PXA25x | ||
265 | |||
266 | config MACH_HIMALAYA | ||
267 | bool "HTC Himalaya Support" | ||
268 | select CPU_PXA26x | ||
269 | select FB_W100 | ||
270 | |||
341 | config MACH_MAGICIAN | 271 | config MACH_MAGICIAN |
342 | bool "Enable HTC Magician Support" | 272 | bool "Enable HTC Magician Support" |
343 | select PXA27x | 273 | select PXA27x |
@@ -346,11 +276,6 @@ config MACH_MAGICIAN | |||
346 | select HAVE_PWM | 276 | select HAVE_PWM |
347 | select PXA_HAVE_BOARD_IRQS | 277 | select PXA_HAVE_BOARD_IRQS |
348 | 278 | ||
349 | config MACH_HIMALAYA | ||
350 | bool "HTC Himalaya Support" | ||
351 | select CPU_PXA26x | ||
352 | select FB_W100 | ||
353 | |||
354 | config MACH_MIOA701 | 279 | config MACH_MIOA701 |
355 | bool "Mitac Mio A701 Support" | 280 | bool "Mitac Mio A701 Support" |
356 | select PXA27x | 281 | select PXA27x |
@@ -362,13 +287,47 @@ config MACH_MIOA701 | |||
362 | MIO A701. Currently there is only basic support | 287 | MIO A701. Currently there is only basic support |
363 | for this PDA. | 288 | for this PDA. |
364 | 289 | ||
365 | config MACH_PCM027 | 290 | config PXA_EZX |
366 | bool "Phytec phyCORE-PXA270 CPU module (PCM-027)" | 291 | bool "Motorola EZX Platform" |
367 | select PXA27x | 292 | select PXA27x |
368 | select IWMMXT | 293 | select IWMMXT |
369 | select PXA_SSP | 294 | select HAVE_PWM |
370 | select PXA_HAVE_BOARD_IRQS | 295 | select PXA_HAVE_BOARD_IRQS |
371 | 296 | ||
297 | config MACH_EZX_A780 | ||
298 | bool "Motorola EZX A780" | ||
299 | default y | ||
300 | depends on PXA_EZX | ||
301 | |||
302 | config MACH_EZX_E680 | ||
303 | bool "Motorola EZX E680" | ||
304 | default y | ||
305 | depends on PXA_EZX | ||
306 | |||
307 | config MACH_EZX_A1200 | ||
308 | bool "Motorola EZX A1200" | ||
309 | default y | ||
310 | depends on PXA_EZX | ||
311 | |||
312 | config MACH_EZX_A910 | ||
313 | bool "Motorola EZX A910" | ||
314 | default y | ||
315 | depends on PXA_EZX | ||
316 | |||
317 | config MACH_EZX_E6 | ||
318 | bool "Motorola EZX E6" | ||
319 | default y | ||
320 | depends on PXA_EZX | ||
321 | |||
322 | config MACH_EZX_E2 | ||
323 | bool "Motorola EZX E2" | ||
324 | default y | ||
325 | depends on PXA_EZX | ||
326 | |||
327 | config MACH_MP900C | ||
328 | bool "Nec Mobilepro 900/c" | ||
329 | select PXA25x | ||
330 | |||
372 | config ARCH_PXA_PALM | 331 | config ARCH_PXA_PALM |
373 | bool "PXA based Palm PDAs" | 332 | bool "PXA based Palm PDAs" |
374 | select HAVE_PWM | 333 | select HAVE_PWM |
@@ -421,6 +380,16 @@ config MACH_PALMZ72 | |||
421 | Say Y here if you intend to run this kernel on Palm Zire 72 | 380 | Say Y here if you intend to run this kernel on Palm Zire 72 |
422 | handheld computer. | 381 | handheld computer. |
423 | 382 | ||
383 | config MACH_PALMLD | ||
384 | bool "Palm LifeDrive" | ||
385 | default y | ||
386 | depends on ARCH_PXA_PALM | ||
387 | select PXA27x | ||
388 | select IWMMXT | ||
389 | help | ||
390 | Say Y here if you intend to run this kernel on a Palm LifeDrive | ||
391 | handheld computer. | ||
392 | |||
424 | config PALM_TREO | 393 | config PALM_TREO |
425 | bool | 394 | bool |
426 | depends on ARCH_PXA_PALM | 395 | depends on ARCH_PXA_PALM |
@@ -447,99 +416,136 @@ config MACH_TREO680 | |||
447 | Say Y here if you intend to run this kernel on Palm Treo 680 | 416 | Say Y here if you intend to run this kernel on Palm Treo 680 |
448 | smartphone. | 417 | smartphone. |
449 | 418 | ||
450 | config MACH_PALMLD | 419 | config PXA_SHARPSL |
451 | bool "Palm LifeDrive" | 420 | bool "SHARP Zaurus SL-5600, SL-C7xx and SL-Cxx00 Models" |
452 | default y | 421 | select SHARP_SCOOP |
453 | depends on ARCH_PXA_PALM | 422 | select SHARP_PARAM |
454 | select PXA27x | ||
455 | select IWMMXT | ||
456 | help | 423 | help |
457 | Say Y here if you intend to run this kernel on a Palm LifeDrive | 424 | Say Y here if you intend to run this kernel on a |
425 | Sharp Zaurus SL-5600 (Poodle), SL-C700 (Corgi), | ||
426 | SL-C750 (Shepherd), SL-C760 (Husky), SL-C1000 (Akita), | ||
427 | SL-C3000 (Spitz), SL-C3100 (Borzoi) or SL-C6000x (Tosa) | ||
458 | handheld computer. | 428 | handheld computer. |
459 | 429 | ||
460 | config MACH_PCM990_BASEBOARD | 430 | config SHARPSL_PM |
461 | bool "PHYTEC PCM-990 development board" | 431 | bool |
462 | select HAVE_PWM | 432 | select APM_EMULATION |
463 | depends on MACH_PCM027 | ||
464 | 433 | ||
465 | choice | 434 | config CORGI_SSP_DEPRECATED |
466 | prompt "display on pcm990" | 435 | bool |
467 | depends on MACH_PCM990_BASEBOARD | 436 | select PXA_SSP |
437 | help | ||
438 | This option will include corgi_ssp.c and corgi_lcd.c | ||
439 | that corgi_ts.c and other legacy drivers (corgi_bl.c | ||
440 | and sharpsl_pm.c) may depend on. | ||
468 | 441 | ||
469 | config PCM990_DISPLAY_SHARP | 442 | config MACH_POODLE |
470 | bool "sharp lq084v1dg21 stn display" | 443 | bool "Enable Sharp SL-5600 (Poodle) Support" |
444 | depends on PXA_SHARPSL | ||
445 | select PXA25x | ||
446 | select SHARP_LOCOMO | ||
447 | select PXA_SSP | ||
471 | 448 | ||
472 | config PCM990_DISPLAY_NEC | 449 | config MACH_CORGI |
473 | bool "nec nl6448bc20_18d tft display" | 450 | bool "Enable Sharp SL-C700 (Corgi) Support" |
451 | depends on PXA_SHARPSL | ||
452 | select PXA25x | ||
453 | select PXA_SHARP_C7xx | ||
474 | 454 | ||
475 | config PCM990_DISPLAY_NONE | 455 | config MACH_SHEPHERD |
476 | bool "no display" | 456 | bool "Enable Sharp SL-C750 (Shepherd) Support" |
457 | depends on PXA_SHARPSL | ||
458 | select PXA25x | ||
459 | select PXA_SHARP_C7xx | ||
477 | 460 | ||
478 | endchoice | 461 | config MACH_HUSKY |
462 | bool "Enable Sharp SL-C760 (Husky) Support" | ||
463 | depends on PXA_SHARPSL | ||
464 | select PXA25x | ||
465 | select PXA_SHARP_C7xx | ||
479 | 466 | ||
480 | config MACH_CSB726 | 467 | config MACH_AKITA |
481 | bool "Enable Cogent CSB726 System On a Module" | 468 | bool "Enable Sharp SL-1000 (Akita) Support" |
469 | depends on PXA_SHARPSL | ||
482 | select PXA27x | 470 | select PXA27x |
483 | select IWMMXT | 471 | select PXA_SHARP_Cxx00 |
484 | help | 472 | select MACH_SPITZ |
485 | Say Y here if you intend to run this kernel on a Cogent | 473 | select I2C |
486 | CSB726 System On Module. | 474 | select I2C_PXA |
487 | 475 | ||
488 | config CSB726_CSB701 | 476 | config MACH_SPITZ |
489 | bool "Enable supprot for CSB701 baseboard" | 477 | bool "Enable Sharp Zaurus SL-3000 (Spitz) Support" |
490 | depends on MACH_CSB726 | 478 | depends on PXA_SHARPSL |
479 | select PXA27x | ||
480 | select PXA_SHARP_Cxx00 | ||
491 | 481 | ||
492 | config PXA_EZX | 482 | config MACH_BORZOI |
493 | bool "Motorola EZX Platform" | 483 | bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support" |
484 | depends on PXA_SHARPSL | ||
494 | select PXA27x | 485 | select PXA27x |
495 | select IWMMXT | 486 | select PXA_SHARP_Cxx00 |
496 | select HAVE_PWM | 487 | |
488 | config MACH_TOSA | ||
489 | bool "Enable Sharp SL-6000x (Tosa) Support" | ||
490 | depends on PXA_SHARPSL | ||
491 | select PXA25x | ||
497 | select PXA_HAVE_BOARD_IRQS | 492 | select PXA_HAVE_BOARD_IRQS |
498 | 493 | ||
499 | config MACH_EZX_A780 | 494 | config ARCH_PXA_ESERIES |
500 | bool "Motorola EZX A780" | 495 | bool "PXA based Toshiba e-series PDAs" |
501 | default y | 496 | select PXA25x |
502 | depends on PXA_EZX | 497 | select PXA_HAVE_BOARD_IRQS |
503 | 498 | ||
504 | config MACH_EZX_E680 | 499 | config MACH_E330 |
505 | bool "Motorola EZX E680" | 500 | bool "Toshiba e330" |
506 | default y | 501 | default y |
507 | depends on PXA_EZX | 502 | depends on ARCH_PXA_ESERIES |
503 | help | ||
504 | Say Y here if you intend to run this kernel on a Toshiba | ||
505 | e330 family PDA. | ||
508 | 506 | ||
509 | config MACH_EZX_A1200 | 507 | config MACH_E350 |
510 | bool "Motorola EZX A1200" | 508 | bool "Toshiba e350" |
511 | default y | 509 | default y |
512 | depends on PXA_EZX | 510 | depends on ARCH_PXA_ESERIES |
511 | help | ||
512 | Say Y here if you intend to run this kernel on a Toshiba | ||
513 | e350 family PDA. | ||
513 | 514 | ||
514 | config MACH_EZX_A910 | 515 | config MACH_E740 |
515 | bool "Motorola EZX A910" | 516 | bool "Toshiba e740" |
516 | default y | 517 | default y |
517 | depends on PXA_EZX | 518 | depends on ARCH_PXA_ESERIES |
519 | select FB_W100 | ||
520 | help | ||
521 | Say Y here if you intend to run this kernel on a Toshiba | ||
522 | e740 family PDA. | ||
518 | 523 | ||
519 | config MACH_EZX_E6 | 524 | config MACH_E750 |
520 | bool "Motorola EZX E6" | 525 | bool "Toshiba e750" |
521 | default y | 526 | default y |
522 | depends on PXA_EZX | 527 | depends on ARCH_PXA_ESERIES |
528 | select FB_W100 | ||
529 | help | ||
530 | Say Y here if you intend to run this kernel on a Toshiba | ||
531 | e750 family PDA. | ||
523 | 532 | ||
524 | config MACH_EZX_E2 | 533 | config MACH_E400 |
525 | bool "Motorola EZX E2" | 534 | bool "Toshiba e400" |
526 | default y | 535 | default y |
527 | depends on PXA_EZX | 536 | depends on ARCH_PXA_ESERIES |
537 | help | ||
538 | Say Y here if you intend to run this kernel on a Toshiba | ||
539 | e400 family PDA. | ||
528 | 540 | ||
529 | config MACH_XCEP | 541 | config MACH_E800 |
530 | bool "Iskratel Electronics XCEP" | 542 | bool "Toshiba e800" |
531 | select PXA25x | 543 | default y |
532 | select MTD | 544 | depends on ARCH_PXA_ESERIES |
533 | select MTD_PARTITIONS | 545 | select FB_W100 |
534 | select MTD_PHYSMAP | ||
535 | select MTD_CFI_INTELEXT | ||
536 | select MTD_CFI | ||
537 | select MTD_CHAR | ||
538 | select SMC91X | ||
539 | select PXA_SSP | ||
540 | help | 546 | help |
541 | PXA255 based Single Board Computer with SMC 91C111 ethernet chip and 64 MB of flash. | 547 | Say Y here if you intend to run this kernel on a Toshiba |
542 | Tuned for usage in Libera instruments for particle accelerators. | 548 | e800 family PDA. |
543 | 549 | ||
544 | endmenu | 550 | endmenu |
545 | 551 | ||
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile index e5d450c54340..cdaf88831c27 100644 --- a/arch/arm/mach-pxa/Makefile +++ b/arch/arm/mach-pxa/Makefile | |||
@@ -24,33 +24,66 @@ obj-$(CONFIG_CPU_PXA300) += pxa300.o | |||
24 | obj-$(CONFIG_CPU_PXA320) += pxa320.o | 24 | obj-$(CONFIG_CPU_PXA320) += pxa320.o |
25 | obj-$(CONFIG_CPU_PXA930) += pxa930.o | 25 | obj-$(CONFIG_CPU_PXA930) += pxa930.o |
26 | 26 | ||
27 | # Specific board support | 27 | # NOTE: keep the order of boards in accordance to their order in Kconfig |
28 | obj-$(CONFIG_ARCH_GUMSTIX) += gumstix.o | 28 | |
29 | obj-$(CONFIG_GUMSTIX_AM200EPD) += am200epd.o | 29 | # Intel/Marvell Dev Platforms |
30 | obj-$(CONFIG_GUMSTIX_AM300EPD) += am300epd.o | ||
31 | obj-$(CONFIG_ARCH_LUBBOCK) += lubbock.o | 30 | obj-$(CONFIG_ARCH_LUBBOCK) += lubbock.o |
32 | obj-$(CONFIG_MACH_LOGICPD_PXA270) += lpd270.o | ||
33 | obj-$(CONFIG_MACH_MAINSTONE) += mainstone.o | 31 | obj-$(CONFIG_MACH_MAINSTONE) += mainstone.o |
34 | obj-$(CONFIG_MACH_BALLOON3) += balloon3.o | 32 | ifeq ($(CONFIG_MACH_ZYLONITE),y) |
35 | obj-$(CONFIG_MACH_MP900C) += mp900.o | 33 | obj-y += zylonite.o |
34 | obj-$(CONFIG_CPU_PXA300) += zylonite_pxa300.o | ||
35 | obj-$(CONFIG_CPU_PXA320) += zylonite_pxa320.o | ||
36 | endif | ||
37 | obj-$(CONFIG_MACH_LITTLETON) += littleton.o | ||
38 | obj-$(CONFIG_MACH_TAVOREVB) += tavorevb.o | ||
39 | obj-$(CONFIG_MACH_SAAR) += saar.o | ||
40 | |||
41 | # 3rd Party Dev Platforms | ||
36 | obj-$(CONFIG_ARCH_PXA_IDP) += idp.o | 42 | obj-$(CONFIG_ARCH_PXA_IDP) += idp.o |
43 | obj-$(CONFIG_ARCH_VIPER) += viper.o | ||
44 | obj-$(CONFIG_MACH_BALLOON3) += balloon3.o | ||
45 | obj-$(CONFIG_MACH_CSB726) += csb726.o | ||
46 | obj-$(CONFIG_CSB726_CSB701) += csb701.o | ||
47 | obj-$(CONFIG_MACH_ARMCORE) += cm-x2xx.o cm-x255.o cm-x270.o | ||
48 | ifeq ($(CONFIG_PCI),y) | ||
49 | obj-$(CONFIG_MACH_ARMCORE) += cm-x2xx-pci.o | ||
50 | endif | ||
51 | obj-$(CONFIG_MACH_EM_X270) += em-x270.o | ||
52 | obj-$(CONFIG_MACH_CM_X300) += cm-x300.o | ||
53 | obj-$(CONFIG_ARCH_GUMSTIX) += gumstix.o | ||
54 | obj-$(CONFIG_GUMSTIX_AM200EPD) += am200epd.o | ||
55 | obj-$(CONFIG_GUMSTIX_AM300EPD) += am300epd.o | ||
56 | obj-$(CONFIG_MACH_INTELMOTE2) += imote2.o | ||
57 | obj-$(CONFIG_MACH_STARGATE2) += stargate2.o | ||
58 | obj-$(CONFIG_MACH_XCEP) += xcep.o | ||
37 | obj-$(CONFIG_MACH_TRIZEPS4) += trizeps4.o | 59 | obj-$(CONFIG_MACH_TRIZEPS4) += trizeps4.o |
60 | obj-$(CONFIG_MACH_LOGICPD_PXA270) += lpd270.o | ||
61 | obj-$(CONFIG_MACH_PCM027) += pcm027.o | ||
62 | obj-$(CONFIG_MACH_PCM990_BASEBOARD) += pcm990-baseboard.o | ||
38 | obj-$(CONFIG_MACH_COLIBRI) += colibri-pxa270.o | 63 | obj-$(CONFIG_MACH_COLIBRI) += colibri-pxa270.o |
39 | obj-$(CONFIG_MACH_COLIBRI300) += colibri-pxa3xx.o colibri-pxa300.o | 64 | obj-$(CONFIG_MACH_COLIBRI300) += colibri-pxa3xx.o colibri-pxa300.o |
40 | obj-$(CONFIG_MACH_COLIBRI320) += colibri-pxa3xx.o colibri-pxa320.o | 65 | obj-$(CONFIG_MACH_COLIBRI320) += colibri-pxa3xx.o colibri-pxa320.o |
66 | |||
67 | # End-user Products | ||
68 | obj-$(CONFIG_MACH_H4700) += hx4700.o | ||
41 | obj-$(CONFIG_MACH_H5000) += h5000.o | 69 | obj-$(CONFIG_MACH_H5000) += h5000.o |
70 | obj-$(CONFIG_MACH_HIMALAYA) += himalaya.o | ||
71 | obj-$(CONFIG_MACH_MAGICIAN) += magician.o | ||
72 | obj-$(CONFIG_MACH_MIOA701) += mioa701.o mioa701_bootresume.o | ||
73 | obj-$(CONFIG_PXA_EZX) += ezx.o | ||
74 | obj-$(CONFIG_MACH_MP900C) += mp900.o | ||
75 | obj-$(CONFIG_MACH_PALMTE2) += palmte2.o | ||
76 | obj-$(CONFIG_MACH_PALMTC) += palmtc.o | ||
77 | obj-$(CONFIG_MACH_PALMT5) += palmt5.o | ||
78 | obj-$(CONFIG_MACH_PALMTX) += palmtx.o | ||
79 | obj-$(CONFIG_MACH_PALMZ72) += palmz72.o | ||
80 | obj-$(CONFIG_MACH_PALMLD) += palmld.o | ||
81 | obj-$(CONFIG_PALM_TREO) += palmtreo.o | ||
42 | obj-$(CONFIG_PXA_SHARP_C7xx) += corgi.o sharpsl_pm.o corgi_pm.o | 82 | obj-$(CONFIG_PXA_SHARP_C7xx) += corgi.o sharpsl_pm.o corgi_pm.o |
43 | obj-$(CONFIG_PXA_SHARP_Cxx00) += spitz.o sharpsl_pm.o spitz_pm.o | 83 | obj-$(CONFIG_PXA_SHARP_Cxx00) += spitz.o sharpsl_pm.o spitz_pm.o |
44 | obj-$(CONFIG_CORGI_SSP_DEPRECATED) += corgi_ssp.o corgi_lcd.o | 84 | obj-$(CONFIG_CORGI_SSP_DEPRECATED) += corgi_ssp.o corgi_lcd.o |
45 | obj-$(CONFIG_MACH_POODLE) += poodle.o | 85 | obj-$(CONFIG_MACH_POODLE) += poodle.o |
46 | obj-$(CONFIG_MACH_PCM027) += pcm027.o | ||
47 | obj-$(CONFIG_MACH_PCM990_BASEBOARD) += pcm990-baseboard.o | ||
48 | obj-$(CONFIG_MACH_TOSA) += tosa.o | 86 | obj-$(CONFIG_MACH_TOSA) += tosa.o |
49 | obj-$(CONFIG_MACH_EM_X270) += em-x270.o | ||
50 | obj-$(CONFIG_MACH_H4700) += hx4700.o | ||
51 | obj-$(CONFIG_MACH_MAGICIAN) += magician.o | ||
52 | obj-$(CONFIG_MACH_HIMALAYA) += himalaya.o | ||
53 | obj-$(CONFIG_MACH_MIOA701) += mioa701.o mioa701_bootresume.o | ||
54 | obj-$(CONFIG_ARCH_PXA_ESERIES) += eseries.o | 87 | obj-$(CONFIG_ARCH_PXA_ESERIES) += eseries.o |
55 | obj-$(CONFIG_MACH_E330) += e330.o | 88 | obj-$(CONFIG_MACH_E330) += e330.o |
56 | obj-$(CONFIG_MACH_E350) += e350.o | 89 | obj-$(CONFIG_MACH_E350) += e350.o |
@@ -58,34 +91,6 @@ obj-$(CONFIG_MACH_E740) += e740.o | |||
58 | obj-$(CONFIG_MACH_E750) += e750.o | 91 | obj-$(CONFIG_MACH_E750) += e750.o |
59 | obj-$(CONFIG_MACH_E400) += e400.o | 92 | obj-$(CONFIG_MACH_E400) += e400.o |
60 | obj-$(CONFIG_MACH_E800) += e800.o | 93 | obj-$(CONFIG_MACH_E800) += e800.o |
61 | obj-$(CONFIG_MACH_PALMTE2) += palmte2.o | ||
62 | obj-$(CONFIG_MACH_PALMTC) += palmtc.o | ||
63 | obj-$(CONFIG_MACH_PALMT5) += palmt5.o | ||
64 | obj-$(CONFIG_MACH_PALMTX) += palmtx.o | ||
65 | obj-$(CONFIG_MACH_PALMLD) += palmld.o | ||
66 | obj-$(CONFIG_MACH_PALMZ72) += palmz72.o | ||
67 | obj-$(CONFIG_PALM_TREO) += palmtreo.o | ||
68 | obj-$(CONFIG_ARCH_VIPER) += viper.o | ||
69 | |||
70 | ifeq ($(CONFIG_MACH_ZYLONITE),y) | ||
71 | obj-y += zylonite.o | ||
72 | obj-$(CONFIG_CPU_PXA300) += zylonite_pxa300.o | ||
73 | obj-$(CONFIG_CPU_PXA320) += zylonite_pxa320.o | ||
74 | endif | ||
75 | obj-$(CONFIG_MACH_LITTLETON) += littleton.o | ||
76 | obj-$(CONFIG_MACH_TAVOREVB) += tavorevb.o | ||
77 | obj-$(CONFIG_MACH_SAAR) += saar.o | ||
78 | |||
79 | obj-$(CONFIG_MACH_ARMCORE) += cm-x2xx.o cm-x255.o cm-x270.o | ||
80 | obj-$(CONFIG_MACH_CM_X300) += cm-x300.o | ||
81 | obj-$(CONFIG_PXA_EZX) += ezx.o | ||
82 | |||
83 | obj-$(CONFIG_MACH_XCEP) += xcep.o | ||
84 | |||
85 | obj-$(CONFIG_MACH_INTELMOTE2) += imote2.o | ||
86 | obj-$(CONFIG_MACH_STARGATE2) += stargate2.o | ||
87 | obj-$(CONFIG_MACH_CSB726) += csb726.o | ||
88 | obj-$(CONFIG_CSB726_CSB701) += csb701.o | ||
89 | 94 | ||
90 | # Support for blinky lights | 95 | # Support for blinky lights |
91 | led-y := leds.o | 96 | led-y := leds.o |
@@ -95,8 +100,4 @@ led-$(CONFIG_ARCH_PXA_IDP) += leds-idp.o | |||
95 | 100 | ||
96 | obj-$(CONFIG_LEDS) += $(led-y) | 101 | obj-$(CONFIG_LEDS) += $(led-y) |
97 | 102 | ||
98 | ifeq ($(CONFIG_PCI),y) | ||
99 | obj-$(CONFIG_MACH_ARMCORE) += cm-x2xx-pci.o | ||
100 | endif | ||
101 | |||
102 | obj-$(CONFIG_TOSA_BT) += tosa-bt.o | 103 | obj-$(CONFIG_TOSA_BT) += tosa-bt.o |