diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-04-26 09:21:59 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-04-27 05:27:32 -0400 |
commit | 788c9700e7855f8a8cc8875e30d2518b57385c20 (patch) | |
tree | f9b9451bff7189f0c46c33c9542b864658ef1481 /arch/arm | |
parent | 38f7b009a6ae1708fcf0f208aba9a9a4364bcfcf (diff) |
[ARM] Kconfig: sort ARM machine class support choice list by option name
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/Kconfig | 136 |
1 files changed, 68 insertions, 68 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e02b893fb909..a930e5c5672c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -253,6 +253,14 @@ config ARCH_CLPS711X | |||
253 | help | 253 | help |
254 | Support for Cirrus Logic 711x/721x based boards. | 254 | Support for Cirrus Logic 711x/721x based boards. |
255 | 255 | ||
256 | config ARCH_GEMINI | ||
257 | bool "Cortina Systems Gemini" | ||
258 | select CPU_FA526 | ||
259 | select GENERIC_GPIO | ||
260 | select ARCH_REQUIRE_GPIOLIB | ||
261 | help | ||
262 | Support for the Cortina Systems Gemini family SoCs | ||
263 | |||
256 | config ARCH_EBSA110 | 264 | config ARCH_EBSA110 |
257 | bool "EBSA-110" | 265 | bool "EBSA-110" |
258 | select CPU_SA110 | 266 | select CPU_SA110 |
@@ -276,14 +284,6 @@ config ARCH_EP93XX | |||
276 | help | 284 | help |
277 | This enables support for the Cirrus EP93xx series of CPUs. | 285 | This enables support for the Cirrus EP93xx series of CPUs. |
278 | 286 | ||
279 | config ARCH_GEMINI | ||
280 | bool "Cortina Systems Gemini" | ||
281 | select CPU_FA526 | ||
282 | select GENERIC_GPIO | ||
283 | select ARCH_REQUIRE_GPIOLIB | ||
284 | help | ||
285 | Support for the Cortina Systems Gemini family SoCs | ||
286 | |||
287 | config ARCH_FOOTBRIDGE | 287 | config ARCH_FOOTBRIDGE |
288 | bool "FootBridge" | 288 | bool "FootBridge" |
289 | select CPU_SA110 | 289 | select CPU_SA110 |
@@ -292,6 +292,16 @@ config ARCH_FOOTBRIDGE | |||
292 | Support for systems based on the DC21285 companion chip | 292 | Support for systems based on the DC21285 companion chip |
293 | ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder. | 293 | ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder. |
294 | 294 | ||
295 | config ARCH_MXC | ||
296 | bool "Freescale MXC/iMX-based" | ||
297 | select GENERIC_TIME | ||
298 | select GENERIC_CLOCKEVENTS | ||
299 | select ARCH_MTD_XIP | ||
300 | select GENERIC_GPIO | ||
301 | select ARCH_REQUIRE_GPIOLIB | ||
302 | help | ||
303 | Support for Freescale MXC/iMX-based family of processors | ||
304 | |||
295 | config ARCH_NETX | 305 | config ARCH_NETX |
296 | bool "Hilscher NetX based" | 306 | bool "Hilscher NetX based" |
297 | select CPU_ARM926T | 307 | select CPU_ARM926T |
@@ -404,28 +414,6 @@ config ARCH_KIRKWOOD | |||
404 | Support for the following Marvell Kirkwood series SoCs: | 414 | Support for the following Marvell Kirkwood series SoCs: |
405 | 88F6180, 88F6192 and 88F6281. | 415 | 88F6180, 88F6192 and 88F6281. |
406 | 416 | ||
407 | config ARCH_KS8695 | ||
408 | bool "Micrel/Kendin KS8695" | ||
409 | select CPU_ARM922T | ||
410 | select GENERIC_GPIO | ||
411 | select ARCH_REQUIRE_GPIOLIB | ||
412 | help | ||
413 | Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based | ||
414 | System-on-Chip devices. | ||
415 | |||
416 | config ARCH_NS9XXX | ||
417 | bool "NetSilicon NS9xxx" | ||
418 | select CPU_ARM926T | ||
419 | select GENERIC_GPIO | ||
420 | select GENERIC_TIME | ||
421 | select GENERIC_CLOCKEVENTS | ||
422 | select HAVE_CLK | ||
423 | help | ||
424 | Say Y here if you intend to run this kernel on a NetSilicon NS9xxx | ||
425 | System. | ||
426 | |||
427 | <http://www.digi.com/products/microprocessors/index.jsp> | ||
428 | |||
429 | config ARCH_LOKI | 417 | config ARCH_LOKI |
430 | bool "Marvell Loki (88RC8480)" | 418 | bool "Marvell Loki (88RC8480)" |
431 | select CPU_FEROCEON | 419 | select CPU_FEROCEON |
@@ -447,16 +435,6 @@ config ARCH_MV78XX0 | |||
447 | Support for the following Marvell MV78xx0 series SoCs: | 435 | Support for the following Marvell MV78xx0 series SoCs: |
448 | MV781x0, MV782x0. | 436 | MV781x0, MV782x0. |
449 | 437 | ||
450 | config ARCH_MXC | ||
451 | bool "Freescale MXC/iMX-based" | ||
452 | select GENERIC_TIME | ||
453 | select GENERIC_CLOCKEVENTS | ||
454 | select ARCH_MTD_XIP | ||
455 | select GENERIC_GPIO | ||
456 | select ARCH_REQUIRE_GPIOLIB | ||
457 | help | ||
458 | Support for Freescale MXC/iMX-based family of processors | ||
459 | |||
460 | config ARCH_ORION5X | 438 | config ARCH_ORION5X |
461 | bool "Marvell Orion" | 439 | bool "Marvell Orion" |
462 | depends on MMU | 440 | depends on MMU |
@@ -471,6 +449,49 @@ config ARCH_ORION5X | |||
471 | Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182), | 449 | Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182), |
472 | Orion-2 (5281), Orion-1-90 (6183). | 450 | Orion-2 (5281), Orion-1-90 (6183). |
473 | 451 | ||
452 | config ARCH_MMP | ||
453 | bool "Marvell PXA168/910" | ||
454 | depends on MMU | ||
455 | select GENERIC_GPIO | ||
456 | select ARCH_REQUIRE_GPIOLIB | ||
457 | select HAVE_CLK | ||
458 | select COMMON_CLKDEV | ||
459 | select GENERIC_TIME | ||
460 | select GENERIC_CLOCKEVENTS | ||
461 | select TICK_ONESHOT | ||
462 | select PLAT_PXA | ||
463 | help | ||
464 | Support for Marvell's PXA168/910 processor line. | ||
465 | |||
466 | config ARCH_KS8695 | ||
467 | bool "Micrel/Kendin KS8695" | ||
468 | select CPU_ARM922T | ||
469 | select GENERIC_GPIO | ||
470 | select ARCH_REQUIRE_GPIOLIB | ||
471 | help | ||
472 | Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based | ||
473 | System-on-Chip devices. | ||
474 | |||
475 | config ARCH_NS9XXX | ||
476 | bool "NetSilicon NS9xxx" | ||
477 | select CPU_ARM926T | ||
478 | select GENERIC_GPIO | ||
479 | select GENERIC_TIME | ||
480 | select GENERIC_CLOCKEVENTS | ||
481 | select HAVE_CLK | ||
482 | help | ||
483 | Say Y here if you intend to run this kernel on a NetSilicon NS9xxx | ||
484 | System. | ||
485 | |||
486 | <http://www.digi.com/products/microprocessors/index.jsp> | ||
487 | |||
488 | config ARCH_W90X900 | ||
489 | bool "Nuvoton W90X900 CPU" | ||
490 | select CPU_ARM926T | ||
491 | help | ||
492 | Support for Nuvoton (Winbond logic dept.) ARM9 processor,You | ||
493 | can login www.mcuos.com or www.nuvoton.com to know more. | ||
494 | |||
474 | config ARCH_PNX4008 | 495 | config ARCH_PNX4008 |
475 | bool "Philips Nexperia PNX4008 Mobile" | 496 | bool "Philips Nexperia PNX4008 Mobile" |
476 | select CPU_ARM926T | 497 | select CPU_ARM926T |
@@ -495,19 +516,16 @@ config ARCH_PXA | |||
495 | help | 516 | help |
496 | Support for Intel/Marvell's PXA2xx/PXA3xx processor line. | 517 | Support for Intel/Marvell's PXA2xx/PXA3xx processor line. |
497 | 518 | ||
498 | config ARCH_MMP | 519 | config ARCH_MSM |
499 | bool "Marvell PXA168/910" | 520 | bool "Qualcomm MSM" |
500 | depends on MMU | 521 | select CPU_V6 |
501 | select GENERIC_GPIO | ||
502 | select ARCH_REQUIRE_GPIOLIB | ||
503 | select HAVE_CLK | ||
504 | select COMMON_CLKDEV | ||
505 | select GENERIC_TIME | 522 | select GENERIC_TIME |
506 | select GENERIC_CLOCKEVENTS | 523 | select GENERIC_CLOCKEVENTS |
507 | select TICK_ONESHOT | ||
508 | select PLAT_PXA | ||
509 | help | 524 | help |
510 | Support for Marvell's PXA168/910 processor line. | 525 | Support for Qualcomm MSM7K based systems. This runs on the ARM11 |
526 | apps processor of the MSM7K and depends on a shared memory | ||
527 | interface to the ARM9 modem processor which runs the baseband stack | ||
528 | and controls some vital subsystems (clock and power control, etc). | ||
511 | 529 | ||
512 | config ARCH_RPC | 530 | config ARCH_RPC |
513 | bool "RiscPC" | 531 | bool "RiscPC" |
@@ -598,24 +616,6 @@ config ARCH_OMAP | |||
598 | help | 616 | help |
599 | Support for TI's OMAP platform (OMAP1 and OMAP2). | 617 | Support for TI's OMAP platform (OMAP1 and OMAP2). |
600 | 618 | ||
601 | config ARCH_MSM | ||
602 | bool "Qualcomm MSM" | ||
603 | select CPU_V6 | ||
604 | select GENERIC_TIME | ||
605 | select GENERIC_CLOCKEVENTS | ||
606 | help | ||
607 | Support for Qualcomm MSM7K based systems. This runs on the ARM11 | ||
608 | apps processor of the MSM7K and depends on a shared memory | ||
609 | interface to the ARM9 modem processor which runs the baseband stack | ||
610 | and controls some vital subsystems (clock and power control, etc). | ||
611 | |||
612 | config ARCH_W90X900 | ||
613 | bool "Nuvoton W90X900 CPU" | ||
614 | select CPU_ARM926T | ||
615 | help | ||
616 | Support for Nuvoton (Winbond logic dept.) ARM9 processor,You | ||
617 | can login www.mcuos.com or www.nuvoton.com to know more. | ||
618 | |||
619 | endchoice | 619 | endchoice |
620 | 620 | ||
621 | source "arch/arm/mach-clps711x/Kconfig" | 621 | source "arch/arm/mach-clps711x/Kconfig" |