aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-09-21 00:16:30 -0400
committerOlof Johansson <olof@lixom.net>2012-09-21 00:16:30 -0400
commitb74aae9a2074e1caa2e40bf119f3a633f77c94e4 (patch)
treeba465514cff017a3213e65556674c68be5db29f6 /arch/arm/Kconfig
parent5698bd757d55b1bb87edd1a9744ab09c142abfc2 (diff)
parentb97ba3ab4e8ec88164a47c98c91955e90ecd7c6a (diff)
Merge branch 'next/cleanup' into next/multiplatform
* next/cleanup: (358 commits) ARM: tegra: harmony: fix ldo7 regulator-name ARM: OMAP2+: Make omap4-keypad.h local ARM: OMAP2+: Make l4_3xxx.h local ARM: OMAP2+: Make l4_2xxx.h local ARM: OMAP2+: Make l3_3xxx.h local ARM: OMAP2+: Make l3_2xxx.h local ARM: OMAP1: Move irda.h from plat to mach ARM: OMAP2+: Make hdq1w.h local ARM: OMAP2+: Make gpmc-smsc911x.h local ARM: OMAP2+: Make gpmc-smc91x.h local ARM: OMAP1: Move flash.h from plat to mach ARM: OMAP2+: Make debug-devices.h local ARM: OMAP1: Move board-voiceblue.h from plat to mach ARM: OMAP1: Move board-sx1.h from plat to mach ARM: OMAP2+: Make omap-wakeupgen.h local ARM: OMAP2+: Make omap-secure.h local ARM: OMAP2+: Make ctrl_module_wkup_44xx.h local ARM: OMAP2+: Make ctrl_module_pad_wkup_44xx.h local ARM: OMAP2+: Make ctrl_module_pad_core_44xx.h local ARM: OMAP2+: Make ctrl_module_core_44xx.h local ...
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig45
1 files changed, 11 insertions, 34 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2f88d8d97701..6d4d43858483 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -279,7 +279,6 @@ config ARCH_INTEGRATOR
279 select GENERIC_CLOCKEVENTS 279 select GENERIC_CLOCKEVENTS
280 select PLAT_VERSATILE 280 select PLAT_VERSATILE
281 select PLAT_VERSATILE_FPGA_IRQ 281 select PLAT_VERSATILE_FPGA_IRQ
282 select NEED_MACH_IO_H
283 select NEED_MACH_MEMORY_H 282 select NEED_MACH_MEMORY_H
284 select SPARSE_IRQ 283 select SPARSE_IRQ
285 select MULTI_IRQ_HANDLER 284 select MULTI_IRQ_HANDLER
@@ -312,7 +311,6 @@ config ARCH_VERSATILE
312 select ICST 311 select ICST
313 select GENERIC_CLOCKEVENTS 312 select GENERIC_CLOCKEVENTS
314 select ARCH_WANT_OPTIONAL_GPIOLIB 313 select ARCH_WANT_OPTIONAL_GPIOLIB
315 select NEED_MACH_IO_H if PCI
316 select PLAT_VERSATILE 314 select PLAT_VERSATILE
317 select PLAT_VERSATILE_CLOCK 315 select PLAT_VERSATILE_CLOCK
318 select PLAT_VERSATILE_CLCD 316 select PLAT_VERSATILE_CLCD
@@ -407,21 +405,19 @@ config ARCH_GEMINI
407 help 405 help
408 Support for the Cortina Systems Gemini family SoCs 406 Support for the Cortina Systems Gemini family SoCs
409 407
410config ARCH_PRIMA2 408config ARCH_SIRF
411 bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform" 409 bool "CSR SiRF"
412 select CPU_V7
413 select NO_IOPORT 410 select NO_IOPORT
414 select ARCH_REQUIRE_GPIOLIB 411 select ARCH_REQUIRE_GPIOLIB
415 select GENERIC_CLOCKEVENTS 412 select GENERIC_CLOCKEVENTS
416 select CLKDEV_LOOKUP 413 select COMMON_CLK
417 select GENERIC_IRQ_CHIP 414 select GENERIC_IRQ_CHIP
418 select MIGHT_HAVE_CACHE_L2X0 415 select MIGHT_HAVE_CACHE_L2X0
419 select PINCTRL 416 select PINCTRL
420 select PINCTRL_SIRF 417 select PINCTRL_SIRF
421 select USE_OF 418 select USE_OF
422 select ZONE_DMA
423 help 419 help
424 Support for CSR SiRFSoC ARM Cortex A9 Platform 420 Support for CSR SiRFprimaII/Marco/Polo platforms
425 421
426config ARCH_EBSA110 422config ARCH_EBSA110
427 bool "EBSA-110" 423 bool "EBSA-110"
@@ -456,7 +452,7 @@ config ARCH_FOOTBRIDGE
456 select FOOTBRIDGE 452 select FOOTBRIDGE
457 select GENERIC_CLOCKEVENTS 453 select GENERIC_CLOCKEVENTS
458 select HAVE_IDE 454 select HAVE_IDE
459 select NEED_MACH_IO_H 455 select NEED_MACH_IO_H if !MMU
460 select NEED_MACH_MEMORY_H 456 select NEED_MACH_MEMORY_H
461 help 457 help
462 Support for systems based on the DC21285 companion chip 458 Support for systems based on the DC21285 companion chip
@@ -513,7 +509,6 @@ config ARCH_IOP13XX
513 select PCI 509 select PCI
514 select ARCH_SUPPORTS_MSI 510 select ARCH_SUPPORTS_MSI
515 select VMSPLIT_1G 511 select VMSPLIT_1G
516 select NEED_MACH_IO_H
517 select NEED_MACH_MEMORY_H 512 select NEED_MACH_MEMORY_H
518 select NEED_RET_TO_USER 513 select NEED_RET_TO_USER
519 help 514 help
@@ -523,7 +518,6 @@ config ARCH_IOP32X
523 bool "IOP32x-based" 518 bool "IOP32x-based"
524 depends on MMU 519 depends on MMU
525 select CPU_XSCALE 520 select CPU_XSCALE
526 select NEED_MACH_IO_H
527 select NEED_RET_TO_USER 521 select NEED_RET_TO_USER
528 select PLAT_IOP 522 select PLAT_IOP
529 select PCI 523 select PCI
@@ -536,7 +530,6 @@ config ARCH_IOP33X
536 bool "IOP33x-based" 530 bool "IOP33x-based"
537 depends on MMU 531 depends on MMU
538 select CPU_XSCALE 532 select CPU_XSCALE
539 select NEED_MACH_IO_H
540 select NEED_RET_TO_USER 533 select NEED_RET_TO_USER
541 select PLAT_IOP 534 select PLAT_IOP
542 select PCI 535 select PCI
@@ -576,7 +569,6 @@ config ARCH_DOVE
576 select PCI 569 select PCI
577 select ARCH_REQUIRE_GPIOLIB 570 select ARCH_REQUIRE_GPIOLIB
578 select GENERIC_CLOCKEVENTS 571 select GENERIC_CLOCKEVENTS
579 select NEED_MACH_IO_H
580 select PLAT_ORION 572 select PLAT_ORION
581 help 573 help
582 Support for the Marvell Dove SoC 88AP510 574 Support for the Marvell Dove SoC 88AP510
@@ -587,7 +579,6 @@ config ARCH_KIRKWOOD
587 select PCI 579 select PCI
588 select ARCH_REQUIRE_GPIOLIB 580 select ARCH_REQUIRE_GPIOLIB
589 select GENERIC_CLOCKEVENTS 581 select GENERIC_CLOCKEVENTS
590 select NEED_MACH_IO_H
591 select PLAT_ORION 582 select PLAT_ORION
592 help 583 help
593 Support for the following Marvell Kirkwood series SoCs: 584 Support for the following Marvell Kirkwood series SoCs:
@@ -614,7 +605,6 @@ config ARCH_MV78XX0
614 select PCI 605 select PCI
615 select ARCH_REQUIRE_GPIOLIB 606 select ARCH_REQUIRE_GPIOLIB
616 select GENERIC_CLOCKEVENTS 607 select GENERIC_CLOCKEVENTS
617 select NEED_MACH_IO_H
618 select PLAT_ORION 608 select PLAT_ORION
619 help 609 help
620 Support for the following Marvell MV78xx0 series SoCs: 610 Support for the following Marvell MV78xx0 series SoCs:
@@ -627,7 +617,6 @@ config ARCH_ORION5X
627 select PCI 617 select PCI
628 select ARCH_REQUIRE_GPIOLIB 618 select ARCH_REQUIRE_GPIOLIB
629 select GENERIC_CLOCKEVENTS 619 select GENERIC_CLOCKEVENTS
630 select NEED_MACH_IO_H
631 select PLAT_ORION 620 select PLAT_ORION
632 help 621 help
633 Support for the following Marvell Orion 5x series SoCs: 622 Support for the following Marvell Orion 5x series SoCs:
@@ -652,8 +641,9 @@ config ARCH_KS8695
652 bool "Micrel/Kendin KS8695" 641 bool "Micrel/Kendin KS8695"
653 select CPU_ARM922T 642 select CPU_ARM922T
654 select ARCH_REQUIRE_GPIOLIB 643 select ARCH_REQUIRE_GPIOLIB
655 select ARCH_USES_GETTIMEOFFSET
656 select NEED_MACH_MEMORY_H 644 select NEED_MACH_MEMORY_H
645 select CLKSRC_MMIO
646 select GENERIC_CLOCKEVENTS
657 help 647 help
658 Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based 648 Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based
659 System-on-Chip devices. 649 System-on-Chip devices.
@@ -683,7 +673,6 @@ config ARCH_TEGRA
683 select HAVE_CLK 673 select HAVE_CLK
684 select HAVE_SMP 674 select HAVE_SMP
685 select MIGHT_HAVE_CACHE_L2X0 675 select MIGHT_HAVE_CACHE_L2X0
686 select NEED_MACH_IO_H if PCI
687 select ARCH_HAS_CPUFREQ 676 select ARCH_HAS_CPUFREQ
688 select USE_OF 677 select USE_OF
689 help 678 help
@@ -709,14 +698,6 @@ config ARCH_PICOXCELL
709 family of Femtocell devices. The picoxcell support requires device tree 698 family of Femtocell devices. The picoxcell support requires device tree
710 for all boards. 699 for all boards.
711 700
712config ARCH_PNX4008
713 bool "Philips Nexperia PNX4008 Mobile"
714 select CPU_ARM926T
715 select CLKDEV_LOOKUP
716 select ARCH_USES_GETTIMEOFFSET
717 help
718 This enables support for Philips PNX4008 mobile platform.
719
720config ARCH_PXA 701config ARCH_PXA
721 bool "PXA2xx/PXA3xx-based" 702 bool "PXA2xx/PXA3xx-based"
722 depends on MMU 703 depends on MMU
@@ -912,7 +893,6 @@ config ARCH_SHARK
912 select PCI 893 select PCI
913 select ARCH_USES_GETTIMEOFFSET 894 select ARCH_USES_GETTIMEOFFSET
914 select NEED_MACH_MEMORY_H 895 select NEED_MACH_MEMORY_H
915 select NEED_MACH_IO_H
916 help 896 help
917 Support for the StrongARM based Digital DNARD machine, also known 897 Support for the StrongARM based Digital DNARD machine, also known
918 as "Shark" (<http://www.shark-linux.de/shark.html>). 898 as "Shark" (<http://www.shark-linux.de/shark.html>).
@@ -931,6 +911,7 @@ config ARCH_U300
931 select COMMON_CLK 911 select COMMON_CLK
932 select GENERIC_GPIO 912 select GENERIC_GPIO
933 select ARCH_REQUIRE_GPIOLIB 913 select ARCH_REQUIRE_GPIOLIB
914 select SPARSE_IRQ
934 help 915 help
935 Support for ST-Ericsson U300 series mobile platforms. 916 Support for ST-Ericsson U300 series mobile platforms.
936 917
@@ -1118,6 +1099,8 @@ source "arch/arm/mach-exynos/Kconfig"
1118 1099
1119source "arch/arm/mach-shmobile/Kconfig" 1100source "arch/arm/mach-shmobile/Kconfig"
1120 1101
1102source "arch/arm/mach-prima2/Kconfig"
1103
1121source "arch/arm/mach-tegra/Kconfig" 1104source "arch/arm/mach-tegra/Kconfig"
1122 1105
1123source "arch/arm/mach-u300/Kconfig" 1106source "arch/arm/mach-u300/Kconfig"
@@ -1179,12 +1162,6 @@ config XSCALE_PMU
1179 depends on CPU_XSCALE 1162 depends on CPU_XSCALE
1180 default y 1163 default y
1181 1164
1182config CPU_HAS_PMU
1183 depends on (CPU_V6 || CPU_V6K || CPU_V7 || XSCALE_PMU) && \
1184 (!ARCH_OMAP3 || OMAP3_EMU)
1185 default y
1186 bool
1187
1188config MULTI_IRQ_HANDLER 1165config MULTI_IRQ_HANDLER
1189 bool 1166 bool
1190 help 1167 help
@@ -1757,7 +1734,7 @@ config HIGHPTE
1757 1734
1758config HW_PERF_EVENTS 1735config HW_PERF_EVENTS
1759 bool "Enable hardware performance counter support for perf events" 1736 bool "Enable hardware performance counter support for perf events"
1760 depends on PERF_EVENTS && CPU_HAS_PMU 1737 depends on PERF_EVENTS
1761 default y 1738 default y
1762 help 1739 help
1763 Enable hardware performance counter support for perf events. If 1740 Enable hardware performance counter support for perf events. If
generated by cgit v1.2.2 (git 2.25.0) at 2025-03-02 13:14:32 -0500