diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:33:02 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:33:02 -0400 |
commit | 3f30a09a612bac2b531a206c2a58a292dd7ff182 (patch) | |
tree | 62741c2f78aeb3009c66dbcf014ebff2e034e597 /arch/arm/mach-pxa/Kconfig | |
parent | 9e165acf1b9e37af7c0fa39399b43d0bd8600039 (diff) | |
parent | fda50a1c49ad7483eaa29a268d560422c413933f (diff) |
Merge branch 'pxa-all' into devel
Conflicts:
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/include/mach/hardware.h
arch/arm/mach-pxa/spitz.c
Diffstat (limited to 'arch/arm/mach-pxa/Kconfig')
-rw-r--r-- | arch/arm/mach-pxa/Kconfig | 93 |
1 files changed, 90 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index e484f609feda..f27f6b3d6e6f 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig | |||
@@ -38,16 +38,23 @@ config ARCH_LUBBOCK | |||
38 | bool "Intel DBPXA250 Development Platform" | 38 | bool "Intel DBPXA250 Development Platform" |
39 | select PXA25x | 39 | select PXA25x |
40 | select SA1111 | 40 | select SA1111 |
41 | select PXA_HAVE_BOARD_IRQS | ||
41 | 42 | ||
42 | config MACH_LOGICPD_PXA270 | 43 | config MACH_LOGICPD_PXA270 |
43 | bool "LogicPD PXA270 Card Engine Development Platform" | 44 | bool "LogicPD PXA270 Card Engine Development Platform" |
44 | select PXA27x | 45 | select PXA27x |
45 | select HAVE_PWM | 46 | select HAVE_PWM |
47 | select PXA_HAVE_BOARD_IRQS | ||
46 | 48 | ||
47 | config MACH_MAINSTONE | 49 | config MACH_MAINSTONE |
48 | bool "Intel HCDDBBVA0 Development Platform" | 50 | bool "Intel HCDDBBVA0 Development Platform" |
49 | select PXA27x | 51 | select PXA27x |
50 | select HAVE_PWM | 52 | select HAVE_PWM |
53 | select PXA_HAVE_BOARD_IRQS | ||
54 | |||
55 | config MACH_MP900C | ||
56 | bool "Nec Mobilepro 900/c" | ||
57 | select PXA25x | ||
51 | 58 | ||
52 | config ARCH_PXA_IDP | 59 | config ARCH_PXA_IDP |
53 | bool "Accelent Xscale IDP" | 60 | bool "Accelent Xscale IDP" |
@@ -114,10 +121,21 @@ config MACH_TOSA | |||
114 | bool "Enable Sharp SL-6000x (Tosa) Support" | 121 | bool "Enable Sharp SL-6000x (Tosa) Support" |
115 | depends on PXA_SHARPSL | 122 | depends on PXA_SHARPSL |
116 | select PXA25x | 123 | select PXA25x |
124 | select PXA_HAVE_BOARD_IRQS | ||
125 | |||
126 | config ARCH_VIPER | ||
127 | bool "Arcom/Eurotech VIPER SBC" | ||
128 | select PXA25x | ||
129 | select ISA | ||
130 | select I2C_GPIO | ||
131 | select HAVE_PWM | ||
132 | select PXA_HAVE_BOARD_IRQS | ||
133 | select PXA_HAVE_ISA_IRQS | ||
117 | 134 | ||
118 | config ARCH_PXA_ESERIES | 135 | config ARCH_PXA_ESERIES |
119 | bool "PXA based Toshiba e-series PDAs" | 136 | bool "PXA based Toshiba e-series PDAs" |
120 | select PXA25x | 137 | select PXA25x |
138 | select PXA_HAVE_BOARD_IRQS | ||
121 | 139 | ||
122 | config MACH_E330 | 140 | config MACH_E330 |
123 | bool "Toshiba e330" | 141 | bool "Toshiba e330" |
@@ -170,13 +188,41 @@ config MACH_E800 | |||
170 | Say Y here if you intend to run this kernel on a Toshiba | 188 | Say Y here if you intend to run this kernel on a Toshiba |
171 | e800 family PDA. | 189 | e800 family PDA. |
172 | 190 | ||
191 | config TRIZEPS_PXA | ||
192 | bool "PXA based Keith und Koep Trizeps DIMM-Modules" | ||
193 | |||
173 | config MACH_TRIZEPS4 | 194 | config MACH_TRIZEPS4 |
174 | bool "Keith und Koep Trizeps4 DIMM-Module" | 195 | bool "Keith und Koep Trizeps4 DIMM-Module" |
196 | depends on TRIZEPS_PXA | ||
197 | select TRIZEPS_PCMCIA | ||
175 | select PXA27x | 198 | select PXA27x |
176 | 199 | ||
177 | config MACH_TRIZEPS4_CONXS | 200 | config MACH_TRIZEPS4WL |
201 | bool "Keith und Koep Trizeps4-WL DIMM-Module" | ||
202 | depends on TRIZEPS_PXA | ||
203 | select TRIZEPS_PCMCIA | ||
204 | select PXA27x | ||
205 | select PXA_SSP | ||
206 | |||
207 | choice | ||
208 | prompt "Select base board for Trizeps module" | ||
209 | depends on TRIZEPS_PXA | ||
210 | |||
211 | config MACH_TRIZEPS_CONXS | ||
178 | bool "ConXS Eval Board" | 212 | bool "ConXS Eval Board" |
179 | depends on MACH_TRIZEPS4 | 213 | |
214 | config MACH_TRIZEPS_UCONXS | ||
215 | bool "uConXS Eval Board" | ||
216 | |||
217 | config MACH_TRIZEPS_ANY | ||
218 | bool "another Board" | ||
219 | |||
220 | endchoice | ||
221 | |||
222 | config TRIZEPS_PCMCIA | ||
223 | bool | ||
224 | help | ||
225 | Enable PCMCIA support for Trizeps modules | ||
180 | 226 | ||
181 | config MACH_EM_X270 | 227 | config MACH_EM_X270 |
182 | bool "CompuLab EM-x270 platform" | 228 | bool "CompuLab EM-x270 platform" |
@@ -189,6 +235,7 @@ config MACH_COLIBRI | |||
189 | config MACH_ZYLONITE | 235 | config MACH_ZYLONITE |
190 | bool "PXA3xx Development Platform (aka Zylonite)" | 236 | bool "PXA3xx Development Platform (aka Zylonite)" |
191 | select PXA3xx | 237 | select PXA3xx |
238 | select PXA_SSP | ||
192 | select HAVE_PWM | 239 | select HAVE_PWM |
193 | 240 | ||
194 | config MACH_LITTLETON | 241 | config MACH_LITTLETON |
@@ -207,21 +254,42 @@ config MACH_SAAR | |||
207 | select PXA930 | 254 | select PXA930 |
208 | 255 | ||
209 | config MACH_ARMCORE | 256 | config MACH_ARMCORE |
210 | bool "CompuLab CM-X270 modules" | 257 | bool "CompuLab CM-X255/CM-X270 modules" |
211 | select PXA27x | 258 | select PXA27x |
212 | select IWMMXT | 259 | select IWMMXT |
213 | select ZONE_DMA if PCI | 260 | select ZONE_DMA if PCI |
261 | select PXA25x | ||
262 | select PXA_SSP | ||
263 | |||
264 | config MACH_CM_X300 | ||
265 | bool "CompuLab CM-X300 modules" | ||
266 | select PXA3xx | ||
267 | select CPU_PXA300 | ||
214 | 268 | ||
215 | config MACH_MAGICIAN | 269 | config MACH_MAGICIAN |
216 | bool "Enable HTC Magician Support" | 270 | bool "Enable HTC Magician Support" |
217 | select PXA27x | 271 | select PXA27x |
218 | select IWMMXT | 272 | select IWMMXT |
273 | select PXA_HAVE_BOARD_IRQS | ||
274 | |||
275 | config MACH_MIOA701 | ||
276 | bool "Mitac Mio A701 Support" | ||
277 | select PXA27x | ||
278 | select IWMMXT | ||
279 | select LEDS_GPIO | ||
280 | select HAVE_PWM | ||
281 | select GPIO_SYSFS | ||
282 | help | ||
283 | Say Y here if you intend to run this kernel on a | ||
284 | MIO A701. Currently there is only basic support | ||
285 | for this PDA. | ||
219 | 286 | ||
220 | config MACH_PCM027 | 287 | config MACH_PCM027 |
221 | bool "Phytec phyCORE-PXA270 CPU module (PCM-027)" | 288 | bool "Phytec phyCORE-PXA270 CPU module (PCM-027)" |
222 | select PXA27x | 289 | select PXA27x |
223 | select IWMMXT | 290 | select IWMMXT |
224 | select PXA_SSP | 291 | select PXA_SSP |
292 | select PXA_HAVE_BOARD_IRQS | ||
225 | 293 | ||
226 | config ARCH_PXA_PALM | 294 | config ARCH_PXA_PALM |
227 | bool "PXA based Palm PDAs" | 295 | bool "PXA based Palm PDAs" |
@@ -237,6 +305,16 @@ config MACH_PALMTX | |||
237 | Say Y here if you intend to run this kernel on a Palm T|X | 305 | Say Y here if you intend to run this kernel on a Palm T|X |
238 | handheld computer. | 306 | handheld computer. |
239 | 307 | ||
308 | config MACH_PALMZ72 | ||
309 | bool "Palm Zire 72" | ||
310 | default y | ||
311 | depends on ARCH_PXA_PALM | ||
312 | select PXA27x | ||
313 | select IWMMXT | ||
314 | help | ||
315 | Say Y here if you intend to run this kernel on Palm Zire 72 | ||
316 | handheld computer. | ||
317 | |||
240 | config MACH_PCM990_BASEBOARD | 318 | config MACH_PCM990_BASEBOARD |
241 | bool "PHYTEC PCM-990 development board" | 319 | bool "PHYTEC PCM-990 development board" |
242 | select HAVE_PWM | 320 | select HAVE_PWM |
@@ -257,6 +335,9 @@ config PCM990_DISPLAY_NONE | |||
257 | 335 | ||
258 | endchoice | 336 | endchoice |
259 | 337 | ||
338 | config MACH_AM200EPD | ||
339 | depends on MACH_GUMSTIX_F | ||
340 | bool "Enable AM200EPD board support" | ||
260 | 341 | ||
261 | config PXA_EZX | 342 | config PXA_EZX |
262 | bool "Motorola EZX Platform" | 343 | bool "Motorola EZX Platform" |
@@ -344,4 +425,10 @@ config TOSA_BT | |||
344 | This is a simple driver that is able to control | 425 | This is a simple driver that is able to control |
345 | the state of built in bluetooth chip on tosa. | 426 | the state of built in bluetooth chip on tosa. |
346 | 427 | ||
428 | config PXA_HAVE_BOARD_IRQS | ||
429 | bool | ||
430 | |||
431 | config PXA_HAVE_ISA_IRQS | ||
432 | bool | ||
433 | |||
347 | endif | 434 | endif |