diff options
-rw-r--r-- | arch/arm/Kconfig | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 638f1d8080a9..35c5326311b3 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -244,6 +244,15 @@ config ARCH_IMX | |||
244 | help | 244 | help |
245 | Support for Motorola's i.MX family of processors (MX1, MXL). | 245 | Support for Motorola's i.MX family of processors (MX1, MXL). |
246 | 246 | ||
247 | config ARCH_IOP13XX | ||
248 | bool "IOP13xx-based" | ||
249 | depends on MMU | ||
250 | select PLAT_IOP | ||
251 | select PCI | ||
252 | select ARCH_SUPPORTS_MSI | ||
253 | help | ||
254 | Support for Intel's IOP13XX (XScale) family of processors. | ||
255 | |||
247 | config ARCH_IOP32X | 256 | config ARCH_IOP32X |
248 | bool "IOP32x-based" | 257 | bool "IOP32x-based" |
249 | depends on MMU | 258 | depends on MMU |
@@ -261,22 +270,12 @@ config ARCH_IOP33X | |||
261 | help | 270 | help |
262 | Support for Intel's IOP33X (XScale) family of processors. | 271 | Support for Intel's IOP33X (XScale) family of processors. |
263 | 272 | ||
264 | config ARCH_IOP13XX | 273 | config ARCH_IXP23XX |
265 | bool "IOP13xx-based" | 274 | bool "IXP23XX-based" |
266 | depends on MMU | ||
267 | select PLAT_IOP | ||
268 | select PCI | ||
269 | select ARCH_SUPPORTS_MSI | ||
270 | help | ||
271 | Support for Intel's IOP13XX (XScale) family of processors. | ||
272 | |||
273 | config ARCH_IXP4XX | ||
274 | bool "IXP4xx-based" | ||
275 | depends on MMU | 275 | depends on MMU |
276 | select GENERIC_TIME | 276 | select PCI |
277 | select GENERIC_CLOCKEVENTS | ||
278 | help | 277 | help |
279 | Support for Intel's IXP4XX (XScale) family of processors. | 278 | Support for Intel's IXP23xx (XScale) family of processors. |
280 | 279 | ||
281 | config ARCH_IXP2000 | 280 | config ARCH_IXP2000 |
282 | bool "IXP2400/2800-based" | 281 | bool "IXP2400/2800-based" |
@@ -285,12 +284,13 @@ config ARCH_IXP2000 | |||
285 | help | 284 | help |
286 | Support for Intel's IXP2400/2800 (XScale) family of processors. | 285 | Support for Intel's IXP2400/2800 (XScale) family of processors. |
287 | 286 | ||
288 | config ARCH_IXP23XX | 287 | config ARCH_IXP4XX |
289 | bool "IXP23XX-based" | 288 | bool "IXP4xx-based" |
290 | depends on MMU | 289 | depends on MMU |
291 | select PCI | 290 | select GENERIC_TIME |
291 | select GENERIC_CLOCKEVENTS | ||
292 | help | 292 | help |
293 | Support for Intel's IXP23xx (XScale) family of processors. | 293 | Support for Intel's IXP4XX (XScale) family of processors. |
294 | 294 | ||
295 | config ARCH_L7200 | 295 | config ARCH_L7200 |
296 | bool "LinkUp-L7200" | 296 | bool "LinkUp-L7200" |
@@ -380,13 +380,6 @@ config ARCH_LH7A40X | |||
380 | core with a wide array of integrated devices for | 380 | core with a wide array of integrated devices for |
381 | hand-held and low-power applications. | 381 | hand-held and low-power applications. |
382 | 382 | ||
383 | config ARCH_OMAP | ||
384 | bool "TI OMAP" | ||
385 | select GENERIC_GPIO | ||
386 | select GENERIC_TIME | ||
387 | help | ||
388 | Support for TI's OMAP platform (OMAP1 and OMAP2). | ||
389 | |||
390 | config ARCH_DAVINCI | 383 | config ARCH_DAVINCI |
391 | bool "TI DaVinci" | 384 | bool "TI DaVinci" |
392 | select GENERIC_TIME | 385 | select GENERIC_TIME |
@@ -394,6 +387,13 @@ config ARCH_DAVINCI | |||
394 | help | 387 | help |
395 | Support for TI's DaVinci platform. | 388 | Support for TI's DaVinci platform. |
396 | 389 | ||
390 | config ARCH_OMAP | ||
391 | bool "TI OMAP" | ||
392 | select GENERIC_GPIO | ||
393 | select GENERIC_TIME | ||
394 | help | ||
395 | Support for TI's OMAP platform (OMAP1 and OMAP2). | ||
396 | |||
397 | endchoice | 397 | endchoice |
398 | 398 | ||
399 | source "arch/arm/mach-clps711x/Kconfig" | 399 | source "arch/arm/mach-clps711x/Kconfig" |