Merge branch 'arm/common-kconfig-refactor+for-rmk' of git://git.linaro.org/people/dmart/linux-2.6-arm into devel-stable

+22 -4

arch/arm/Kconfig

··· 340 340 select ARM_AMBA 341 341 select ARM_GIC 342 342 select ARM_TIMER_SP804 343 + select CACHE_L2X0 343 344 select CLKDEV_LOOKUP 344 345 select CPU_V7 345 346 select GENERIC_CLOCKEVENTS 346 347 select HAVE_ARM_SCU 348 + select HAVE_SMP 347 349 select USE_OF 348 350 help 349 351 Support for the Calxeda Highbank SoC based boards. ··· 363 361 select CPU_V6K 364 362 select GENERIC_CLOCKEVENTS 365 363 select ARM_GIC 364 + select MIGHT_HAVE_CACHE_L2X0 366 365 select MIGHT_HAVE_PCI 367 366 select PCI_DOMAINS if PCI 368 367 help ··· 384 381 select GENERIC_CLOCKEVENTS 385 382 select CLKDEV_LOOKUP 386 383 select GENERIC_IRQ_CHIP 384 + select MIGHT_HAVE_CACHE_L2X0 387 385 select USE_OF 388 386 select ZONE_DMA 389 387 help ··· 637 633 select GENERIC_GPIO 638 634 select HAVE_CLK 639 635 select HAVE_SCHED_CLOCK 636 + select HAVE_SMP 637 + select MIGHT_HAVE_CACHE_L2X0 640 638 select ARCH_HAS_CPUFREQ 641 639 help 642 640 This enables support for NVIDIA Tegra based systems (Tegra APX, ··· 708 702 select HAVE_CLK 709 703 select CLKDEV_LOOKUP 710 704 select HAVE_MACH_CLKDEV 705 + select HAVE_SMP 711 706 select GENERIC_CLOCKEVENTS 707 + select MIGHT_HAVE_CACHE_L2X0 712 708 select NO_IOPORT 713 709 select SPARSE_IRQ 714 710 select MULTI_IRQ_HANDLER ··· 912 904 select CLKDEV_LOOKUP 913 905 select ARCH_REQUIRE_GPIOLIB 914 906 select ARCH_HAS_CPUFREQ 907 + select HAVE_SMP 908 + select MIGHT_HAVE_CACHE_L2X0 915 909 help 916 910 Support for ST-Ericsson's Ux500 architecture 917 911 ··· 924 914 select CPU_ARM926T 925 915 select CLKDEV_LOOKUP 926 916 select GENERIC_CLOCKEVENTS 917 + select MIGHT_HAVE_CACHE_L2X0 927 918 select ARCH_REQUIRE_GPIOLIB 928 919 help 929 920 Support for the Nomadik platform by ST-Ericsson ··· 984 973 select ARM_GIC 985 974 select ARM_AMBA 986 975 select ICST 976 + select MIGHT_HAVE_CACHE_L2X0 987 977 select USE_OF 988 978 help 989 979 Support for Xilinx Zynq ARM Cortex A9 Platform ··· 1446 1434 1447 1435 source "kernel/time/Kconfig" 1448 1436 1437 + config HAVE_SMP 1438 + bool 1439 + help 1440 + This option should be selected by machines which have an SMP- 1441 + capable CPU. 1442 + 1443 + The only effect of this option is to make the SMP-related 1444 + options available to the user for configuration. 1445 + 1449 1446 config SMP 1450 1447 bool "Symmetric Multi-Processing" 1451 1448 depends on CPU_V6K || CPU_V7 1452 1449 depends on GENERIC_CLOCKEVENTS 1453 - depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \ 1454 - MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \ 1455 - ARCH_EXYNOS4 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \ 1456 - ARCH_MSM_SCORPIONMP || ARCH_SHMOBILE || ARCH_HIGHBANK || SOC_IMX6Q 1450 + depends on HAVE_SMP 1457 1451 depends on MMU 1458 1452 select USE_GENERIC_SMP_HELPERS 1459 1453 select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP

+2

arch/arm/mach-exynos/Kconfig

··· 17 17 18 18 config ARCH_EXYNOS4 19 19 bool "SAMSUNG EXYNOS4" 20 + select HAVE_SMP 21 + select MIGHT_HAVE_CACHE_L2X0 20 22 help 21 23 Samsung EXYNOS4 SoCs based systems 22 24

+1 -1

arch/arm/mach-imx/Kconfig

··· 596 596 config SOC_IMX6Q 597 597 bool "i.MX6 Quad support" 598 598 select ARM_GIC 599 - select CACHE_L2X0 600 599 select CPU_V7 601 600 select HAVE_ARM_SCU 602 601 select HAVE_IMX_GPC 603 602 select HAVE_IMX_MMDC 604 603 select HAVE_IMX_SRC 604 + select HAVE_SMP 605 605 select USE_OF 606 606 607 607 help

+1

arch/arm/mach-msm/Kconfig

··· 67 67 bool 68 68 config ARCH_MSM_SCORPIONMP 69 69 bool 70 + select HAVE_SMP 70 71 71 72 config ARCH_MSM_ARM11 72 73 bool

+2

arch/arm/mach-omap2/Kconfig

··· 43 43 bool "TI OMAP4" 44 44 default y 45 45 depends on ARCH_OMAP2PLUS 46 + select CACHE_L2X0 46 47 select CPU_V7 47 48 select ARM_GIC 49 + select HAVE_SMP 48 50 select LOCAL_TIMERS if SMP 49 51 select PL310_ERRATA_588369 50 52 select PL310_ERRATA_727915

+9

arch/arm/mach-realview/Kconfig

··· 12 12 bool "Support Multicore Cortex-A9 Tile" 13 13 depends on MACH_REALVIEW_EB 14 14 select CPU_V7 15 + select HAVE_SMP 16 + select MIGHT_HAVE_CACHE_L2X0 15 17 help 16 18 Enable support for the Cortex-A9MPCore tile fitted to the 17 19 Realview(R) Emulation Baseboard platform. ··· 23 21 depends on MACH_REALVIEW_EB 24 22 select CPU_V6K 25 23 select ARCH_HAS_BARRIERS if SMP 24 + select HAVE_SMP 25 + select MIGHT_HAVE_CACHE_L2X0 26 26 help 27 27 Enable support for the ARM11MPCore tile fitted to the Realview(R) 28 28 Emulation Baseboard platform. ··· 43 39 select CPU_V6K 44 40 select ARM_GIC 45 41 select HAVE_PATA_PLATFORM 42 + select HAVE_SMP 43 + select MIGHT_HAVE_CACHE_L2X0 46 44 select ARCH_HAS_BARRIERS if SMP 47 45 help 48 46 Include support for the ARM(R) RealView(R) Platform Baseboard for ··· 57 51 select CPU_V6 58 52 select ARM_GIC 59 53 select HAVE_TCM 54 + select MIGHT_HAVE_CACHE_L2X0 60 55 help 61 56 Include support for the ARM(R) RealView(R) Platform Baseboard for 62 57 ARM1176JZF-S. ··· 85 78 bool "Support RealView(R) Platform Baseboard Explore" 86 79 select ARM_GIC 87 80 select HAVE_PATA_PLATFORM 81 + select HAVE_SMP 82 + select MIGHT_HAVE_CACHE_L2X0 88 83 select ARCH_SPARSEMEM_ENABLE if CPU_V7 && !REALVIEW_HIGH_PHYS_OFFSET 89 84 select ZONE_DMA if SPARSEMEM 90 85 help

+2

arch/arm/mach-vexpress/Kconfig

··· 8 8 select ARM_ERRATA_720789 9 9 select ARM_ERRATA_751472 10 10 select ARM_ERRATA_753970 11 + select HAVE_SMP 12 + select MIGHT_HAVE_CACHE_L2X0 11 13 12 14 endmenu

+16 -7

arch/arm/mm/Kconfig

··· 833 833 Say Y here to use the Feroceon L2 cache in writethrough mode. 834 834 Unless you specifically require this, say N for writeback mode. 835 835 836 + config MIGHT_HAVE_CACHE_L2X0 837 + bool 838 + help 839 + This option should be selected by machines which have a L2x0 840 + or PL310 cache controller, but where its use is optional. 841 + 842 + The only effect of this option is to make CACHE_L2X0 and 843 + related options available to the user for configuration. 844 + 845 + Boards or SoCs which always require the cache controller 846 + support to be present should select CACHE_L2X0 directly 847 + instead of this option, thus preventing the user from 848 + inadvertently configuring a broken kernel. 849 + 836 850 config CACHE_L2X0 837 - bool "Enable the L2x0 outer cache controller" 838 - depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \ 839 - REALVIEW_EB_A9MP || ARCH_IMX_V6_V7 || MACH_REALVIEW_PBX || \ 840 - ARCH_NOMADIK || ARCH_OMAP4 || ARCH_EXYNOS4 || ARCH_TEGRA || \ 841 - ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE || \ 842 - ARCH_PRIMA2 || ARCH_ZYNQ || ARCH_CNS3XXX || ARCH_HIGHBANK 843 - default y 851 + bool "Enable the L2x0 outer cache controller" if MIGHT_HAVE_CACHE_L2X0 852 + default MIGHT_HAVE_CACHE_L2X0 844 853 select OUTER_CACHE 845 854 select OUTER_CACHE_SYNC 846 855 help

+1

arch/arm/plat-mxc/Kconfig

··· 20 20 bool "i.MX3, i.MX6" 21 21 select AUTO_ZRELADDR if !ZBOOT_ROM 22 22 select ARM_PATCH_PHYS_VIRT 23 + select MIGHT_HAVE_CACHE_L2X0 23 24 help 24 25 This enables support for systems based on the Freescale i.MX3 and i.MX6 25 26 family.