diff options
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 62 |
1 files changed, 42 insertions, 20 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 776d76b8cb69..444822526a07 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -258,6 +258,7 @@ config ARCH_INTEGRATOR | |||
258 | select ARCH_HAS_CPUFREQ | 258 | select ARCH_HAS_CPUFREQ |
259 | select CLKDEV_LOOKUP | 259 | select CLKDEV_LOOKUP |
260 | select HAVE_MACH_CLKDEV | 260 | select HAVE_MACH_CLKDEV |
261 | select HAVE_TCM | ||
261 | select ICST | 262 | select ICST |
262 | select GENERIC_CLOCKEVENTS | 263 | select GENERIC_CLOCKEVENTS |
263 | select PLAT_VERSATILE | 264 | select PLAT_VERSATILE |
@@ -341,10 +342,12 @@ config ARCH_HIGHBANK | |||
341 | select ARM_AMBA | 342 | select ARM_AMBA |
342 | select ARM_GIC | 343 | select ARM_GIC |
343 | select ARM_TIMER_SP804 | 344 | select ARM_TIMER_SP804 |
345 | select CACHE_L2X0 | ||
344 | select CLKDEV_LOOKUP | 346 | select CLKDEV_LOOKUP |
345 | select CPU_V7 | 347 | select CPU_V7 |
346 | select GENERIC_CLOCKEVENTS | 348 | select GENERIC_CLOCKEVENTS |
347 | select HAVE_ARM_SCU | 349 | select HAVE_ARM_SCU |
350 | select HAVE_SMP | ||
348 | select USE_OF | 351 | select USE_OF |
349 | help | 352 | help |
350 | Support for the Calxeda Highbank SoC based boards. | 353 | Support for the Calxeda Highbank SoC based boards. |
@@ -362,6 +365,7 @@ config ARCH_CNS3XXX | |||
362 | select CPU_V6K | 365 | select CPU_V6K |
363 | select GENERIC_CLOCKEVENTS | 366 | select GENERIC_CLOCKEVENTS |
364 | select ARM_GIC | 367 | select ARM_GIC |
368 | select MIGHT_HAVE_CACHE_L2X0 | ||
365 | select MIGHT_HAVE_PCI | 369 | select MIGHT_HAVE_PCI |
366 | select PCI_DOMAINS if PCI | 370 | select PCI_DOMAINS if PCI |
367 | help | 371 | help |
@@ -382,6 +386,7 @@ config ARCH_PRIMA2 | |||
382 | select GENERIC_CLOCKEVENTS | 386 | select GENERIC_CLOCKEVENTS |
383 | select CLKDEV_LOOKUP | 387 | select CLKDEV_LOOKUP |
384 | select GENERIC_IRQ_CHIP | 388 | select GENERIC_IRQ_CHIP |
389 | select MIGHT_HAVE_CACHE_L2X0 | ||
385 | select USE_OF | 390 | select USE_OF |
386 | select ZONE_DMA | 391 | select ZONE_DMA |
387 | help | 392 | help |
@@ -634,6 +639,8 @@ config ARCH_TEGRA | |||
634 | select GENERIC_GPIO | 639 | select GENERIC_GPIO |
635 | select HAVE_CLK | 640 | select HAVE_CLK |
636 | select HAVE_SCHED_CLOCK | 641 | select HAVE_SCHED_CLOCK |
642 | select HAVE_SMP | ||
643 | select MIGHT_HAVE_CACHE_L2X0 | ||
637 | select ARCH_HAS_CPUFREQ | 644 | select ARCH_HAS_CPUFREQ |
638 | help | 645 | help |
639 | This enables support for NVIDIA Tegra based systems (Tegra APX, | 646 | This enables support for NVIDIA Tegra based systems (Tegra APX, |
@@ -703,7 +710,9 @@ config ARCH_SHMOBILE | |||
703 | select HAVE_CLK | 710 | select HAVE_CLK |
704 | select CLKDEV_LOOKUP | 711 | select CLKDEV_LOOKUP |
705 | select HAVE_MACH_CLKDEV | 712 | select HAVE_MACH_CLKDEV |
713 | select HAVE_SMP | ||
706 | select GENERIC_CLOCKEVENTS | 714 | select GENERIC_CLOCKEVENTS |
715 | select MIGHT_HAVE_CACHE_L2X0 | ||
707 | select NO_IOPORT | 716 | select NO_IOPORT |
708 | select SPARSE_IRQ | 717 | select SPARSE_IRQ |
709 | select MULTI_IRQ_HANDLER | 718 | select MULTI_IRQ_HANDLER |
@@ -868,16 +877,6 @@ config ARCH_SHARK | |||
868 | Support for the StrongARM based Digital DNARD machine, also known | 877 | Support for the StrongARM based Digital DNARD machine, also known |
869 | as "Shark" (<http://www.shark-linux.de/shark.html>). | 878 | as "Shark" (<http://www.shark-linux.de/shark.html>). |
870 | 879 | ||
871 | config ARCH_TCC_926 | ||
872 | bool "Telechips TCC ARM926-based systems" | ||
873 | select CLKSRC_MMIO | ||
874 | select CPU_ARM926T | ||
875 | select HAVE_CLK | ||
876 | select CLKDEV_LOOKUP | ||
877 | select GENERIC_CLOCKEVENTS | ||
878 | help | ||
879 | Support for Telechips TCC ARM926-based systems. | ||
880 | |||
881 | config ARCH_U300 | 880 | config ARCH_U300 |
882 | bool "ST-Ericsson U300 Series" | 881 | bool "ST-Ericsson U300 Series" |
883 | depends on MMU | 882 | depends on MMU |
@@ -905,6 +904,8 @@ config ARCH_U8500 | |||
905 | select CLKDEV_LOOKUP | 904 | select CLKDEV_LOOKUP |
906 | select ARCH_REQUIRE_GPIOLIB | 905 | select ARCH_REQUIRE_GPIOLIB |
907 | select ARCH_HAS_CPUFREQ | 906 | select ARCH_HAS_CPUFREQ |
907 | select HAVE_SMP | ||
908 | select MIGHT_HAVE_CACHE_L2X0 | ||
908 | help | 909 | help |
909 | Support for ST-Ericsson's Ux500 architecture | 910 | Support for ST-Ericsson's Ux500 architecture |
910 | 911 | ||
@@ -915,6 +916,7 @@ config ARCH_NOMADIK | |||
915 | select CPU_ARM926T | 916 | select CPU_ARM926T |
916 | select CLKDEV_LOOKUP | 917 | select CLKDEV_LOOKUP |
917 | select GENERIC_CLOCKEVENTS | 918 | select GENERIC_CLOCKEVENTS |
919 | select MIGHT_HAVE_CACHE_L2X0 | ||
918 | select ARCH_REQUIRE_GPIOLIB | 920 | select ARCH_REQUIRE_GPIOLIB |
919 | help | 921 | help |
920 | Support for the Nomadik platform by ST-Ericsson | 922 | Support for the Nomadik platform by ST-Ericsson |
@@ -974,6 +976,7 @@ config ARCH_ZYNQ | |||
974 | select ARM_GIC | 976 | select ARM_GIC |
975 | select ARM_AMBA | 977 | select ARM_AMBA |
976 | select ICST | 978 | select ICST |
979 | select MIGHT_HAVE_CACHE_L2X0 | ||
977 | select USE_OF | 980 | select USE_OF |
978 | help | 981 | help |
979 | Support for Xilinx Zynq ARM Cortex A9 Platform | 982 | Support for Xilinx Zynq ARM Cortex A9 Platform |
@@ -1060,8 +1063,6 @@ source "arch/arm/plat-s5p/Kconfig" | |||
1060 | 1063 | ||
1061 | source "arch/arm/plat-spear/Kconfig" | 1064 | source "arch/arm/plat-spear/Kconfig" |
1062 | 1065 | ||
1063 | source "arch/arm/plat-tcc/Kconfig" | ||
1064 | |||
1065 | if ARCH_S3C2410 | 1066 | if ARCH_S3C2410 |
1066 | source "arch/arm/mach-s3c2410/Kconfig" | 1067 | source "arch/arm/mach-s3c2410/Kconfig" |
1067 | source "arch/arm/mach-s3c2412/Kconfig" | 1068 | source "arch/arm/mach-s3c2412/Kconfig" |
@@ -1126,6 +1127,11 @@ config ARM_TIMER_SP804 | |||
1126 | 1127 | ||
1127 | source arch/arm/mm/Kconfig | 1128 | source arch/arm/mm/Kconfig |
1128 | 1129 | ||
1130 | config ARM_NR_BANKS | ||
1131 | int | ||
1132 | default 16 if ARCH_EP93XX | ||
1133 | default 8 | ||
1134 | |||
1129 | config IWMMXT | 1135 | config IWMMXT |
1130 | bool "Enable iWMMXt support" | 1136 | bool "Enable iWMMXt support" |
1131 | depends on CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_PJ4 | 1137 | depends on CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_PJ4 |
@@ -1246,7 +1252,7 @@ config PL310_ERRATA_588369 | |||
1246 | 1252 | ||
1247 | config ARM_ERRATA_720789 | 1253 | config ARM_ERRATA_720789 |
1248 | bool "ARM errata: TLBIASIDIS and TLBIMVAIS operations can broadcast a faulty ASID" | 1254 | bool "ARM errata: TLBIASIDIS and TLBIMVAIS operations can broadcast a faulty ASID" |
1249 | depends on CPU_V7 && SMP | 1255 | depends on CPU_V7 |
1250 | help | 1256 | help |
1251 | This option enables the workaround for the 720789 Cortex-A9 (prior to | 1257 | This option enables the workaround for the 720789 Cortex-A9 (prior to |
1252 | r2p0) erratum. A faulty ASID can be sent to the other CPUs for the | 1258 | r2p0) erratum. A faulty ASID can be sent to the other CPUs for the |
@@ -1282,7 +1288,7 @@ config ARM_ERRATA_743622 | |||
1282 | 1288 | ||
1283 | config ARM_ERRATA_751472 | 1289 | config ARM_ERRATA_751472 |
1284 | bool "ARM errata: Interrupted ICIALLUIS may prevent completion of broadcasted operation" | 1290 | bool "ARM errata: Interrupted ICIALLUIS may prevent completion of broadcasted operation" |
1285 | depends on CPU_V7 && SMP | 1291 | depends on CPU_V7 |
1286 | help | 1292 | help |
1287 | This option enables the workaround for the 751472 Cortex-A9 (prior | 1293 | This option enables the workaround for the 751472 Cortex-A9 (prior |
1288 | to r3p0) erratum. An interrupted ICIALLUIS operation may prevent the | 1294 | to r3p0) erratum. An interrupted ICIALLUIS operation may prevent the |
@@ -1435,14 +1441,20 @@ menu "Kernel Features" | |||
1435 | 1441 | ||
1436 | source "kernel/time/Kconfig" | 1442 | source "kernel/time/Kconfig" |
1437 | 1443 | ||
1444 | config HAVE_SMP | ||
1445 | bool | ||
1446 | help | ||
1447 | This option should be selected by machines which have an SMP- | ||
1448 | capable CPU. | ||
1449 | |||
1450 | The only effect of this option is to make the SMP-related | ||
1451 | options available to the user for configuration. | ||
1452 | |||
1438 | config SMP | 1453 | config SMP |
1439 | bool "Symmetric Multi-Processing" | 1454 | bool "Symmetric Multi-Processing" |
1440 | depends on CPU_V6K || CPU_V7 | 1455 | depends on CPU_V6K || CPU_V7 |
1441 | depends on GENERIC_CLOCKEVENTS | 1456 | depends on GENERIC_CLOCKEVENTS |
1442 | depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \ | 1457 | depends on HAVE_SMP |
1443 | MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \ | ||
1444 | ARCH_EXYNOS4 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \ | ||
1445 | ARCH_MSM_SCORPIONMP || ARCH_SHMOBILE || ARCH_HIGHBANK || SOC_IMX6Q | ||
1446 | depends on MMU | 1458 | depends on MMU |
1447 | select USE_GENERIC_SMP_HELPERS | 1459 | select USE_GENERIC_SMP_HELPERS |
1448 | select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP | 1460 | select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP |
@@ -1560,6 +1572,16 @@ config LOCAL_TIMERS | |||
1560 | accounting to be spread across the timer interval, preventing a | 1572 | accounting to be spread across the timer interval, preventing a |
1561 | "thundering herd" at every timer tick. | 1573 | "thundering herd" at every timer tick. |
1562 | 1574 | ||
1575 | config ARCH_NR_GPIO | ||
1576 | int | ||
1577 | default 1024 if ARCH_SHMOBILE || ARCH_TEGRA | ||
1578 | default 350 if ARCH_U8500 | ||
1579 | default 0 | ||
1580 | help | ||
1581 | Maximum number of GPIOs in the system. | ||
1582 | |||
1583 | If unsure, leave the default value. | ||
1584 | |||
1563 | source kernel/Kconfig.preempt | 1585 | source kernel/Kconfig.preempt |
1564 | 1586 | ||
1565 | config HZ | 1587 | config HZ |
@@ -1972,7 +1994,7 @@ endchoice | |||
1972 | 1994 | ||
1973 | config XIP_KERNEL | 1995 | config XIP_KERNEL |
1974 | bool "Kernel Execute-In-Place from ROM" | 1996 | bool "Kernel Execute-In-Place from ROM" |
1975 | depends on !ZBOOT_ROM | 1997 | depends on !ZBOOT_ROM && !ARM_LPAE |
1976 | help | 1998 | help |
1977 | Execute-In-Place allows the kernel to run from non-volatile storage | 1999 | Execute-In-Place allows the kernel to run from non-volatile storage |
1978 | directly addressable by the CPU, such as NOR flash. This saves RAM | 2000 | directly addressable by the CPU, such as NOR flash. This saves RAM |
@@ -2002,7 +2024,7 @@ config XIP_PHYS_ADDR | |||
2002 | 2024 | ||
2003 | config KEXEC | 2025 | config KEXEC |
2004 | bool "Kexec system call (EXPERIMENTAL)" | 2026 | bool "Kexec system call (EXPERIMENTAL)" |
2005 | depends on EXPERIMENTAL | 2027 | depends on EXPERIMENTAL && (!SMP || HOTPLUG_CPU) |
2006 | help | 2028 | help |
2007 | kexec is a system call that implements the ability to shutdown your | 2029 | kexec is a system call that implements the ability to shutdown your |
2008 | current kernel, and to start another kernel. It is like a reboot | 2030 | current kernel, and to start another kernel. It is like a reboot |