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

9 files changed, 56 insertions, 12 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index abba5b8c9d7..3ee1818540e 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -340,10 +340,12 @@ config ARCH_HIGHBANK
         select ARM_AMBA
         select ARM_GIC
         select ARM_TIMER_SP804
+        select CACHE_L2X0
         select CLKDEV_LOOKUP
         select CPU_V7
         select GENERIC_CLOCKEVENTS
         select HAVE_ARM_SCU
+        select HAVE_SMP
         select USE_OF
         help
           Support for the Calxeda Highbank SoC based boards.
@@ -361,6 +363,7 @@ config ARCH_CNS3XXX
         select CPU_V6K
         select GENERIC_CLOCKEVENTS
         select ARM_GIC
+        select MIGHT_HAVE_CACHE_L2X0
         select MIGHT_HAVE_PCI
         select PCI_DOMAINS if PCI
         help
@@ -381,6 +384,7 @@ config ARCH_PRIMA2
         select GENERIC_CLOCKEVENTS
         select CLKDEV_LOOKUP
         select GENERIC_IRQ_CHIP
+        select MIGHT_HAVE_CACHE_L2X0
         select USE_OF
         select ZONE_DMA
         help
@@ -633,6 +637,8 @@ config ARCH_TEGRA
         select GENERIC_GPIO
         select HAVE_CLK
         select HAVE_SCHED_CLOCK
+        select HAVE_SMP
+        select MIGHT_HAVE_CACHE_L2X0
         select ARCH_HAS_CPUFREQ
         help
           This enables support for NVIDIA Tegra based systems (Tegra APX,
@@ -702,7 +708,9 @@ config ARCH_SHMOBILE
         select HAVE_CLK
         select CLKDEV_LOOKUP
         select HAVE_MACH_CLKDEV
+        select HAVE_SMP
         select GENERIC_CLOCKEVENTS
+        select MIGHT_HAVE_CACHE_L2X0
         select NO_IOPORT
         select SPARSE_IRQ
         select MULTI_IRQ_HANDLER
@@ -904,6 +912,8 @@ config ARCH_U8500
         select CLKDEV_LOOKUP
         select ARCH_REQUIRE_GPIOLIB
         select ARCH_HAS_CPUFREQ
+        select HAVE_SMP
+        select MIGHT_HAVE_CACHE_L2X0
         help
           Support for ST-Ericsson's Ux500 architecture
 
@@ -914,6 +924,7 @@ config ARCH_NOMADIK
         select CPU_ARM926T
         select CLKDEV_LOOKUP
         select GENERIC_CLOCKEVENTS
+        select MIGHT_HAVE_CACHE_L2X0
         select ARCH_REQUIRE_GPIOLIB
         help
           Support for the Nomadik platform by ST-Ericsson
@@ -973,6 +984,7 @@ config ARCH_ZYNQ
         select ARM_GIC
         select ARM_AMBA
         select ICST
+        select MIGHT_HAVE_CACHE_L2X0
         select USE_OF
         help
           Support for Xilinx Zynq ARM Cortex A9 Platform
@@ -1434,14 +1446,20 @@ menu "Kernel Features"
 
 source "kernel/time/Kconfig"
 
+config HAVE_SMP
+        bool
+        help
+          This option should be selected by machines which have an SMP-
+          capable CPU.
+
+          The only effect of this option is to make the SMP-related
+          options available to the user for configuration.
+
 config SMP
         bool "Symmetric Multi-Processing"
         depends on CPU_V6K || CPU_V7
         depends on GENERIC_CLOCKEVENTS
-        depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \
-                 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \
-                 ARCH_EXYNOS4 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \
-                 ARCH_MSM_SCORPIONMP || ARCH_SHMOBILE || ARCH_HIGHBANK || SOC_IMX6Q
+        depends on HAVE_SMP
         depends on MMU
         select USE_GENERIC_SMP_HELPERS
         select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 724ec0f3560..e1efbca2a53 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -17,6 +17,8 @@ choice
 
 config ARCH_EXYNOS4
         bool "SAMSUNG EXYNOS4"
+        select HAVE_SMP
+        select MIGHT_HAVE_CACHE_L2X0
         help
           Samsung EXYNOS4 SoCs based systems
 
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index c44aa974e79..188ecc00915 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -596,12 +596,12 @@ comment "i.MX6 family:"
 config SOC_IMX6Q
         bool "i.MX6 Quad support"
         select ARM_GIC
-        select CACHE_L2X0
         select CPU_V7
         select HAVE_ARM_SCU
         select HAVE_IMX_GPC
         select HAVE_IMX_MMDC
         select HAVE_IMX_SRC
+        select HAVE_SMP
         select USE_OF
 
         help
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index ebde97f5d5f..e6beaff7621 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -67,6 +67,7 @@ config MSM_SOC_REV_A
         bool
 config  ARCH_MSM_SCORPIONMP
         bool
+        select HAVE_SMP
 
 config  ARCH_MSM_ARM11
         bool
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index b6625130831..4f01533083c 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -43,8 +43,10 @@ config ARCH_OMAP4
         bool "TI OMAP4"
         default y
         depends on ARCH_OMAP2PLUS
+        select CACHE_L2X0
         select CPU_V7
         select ARM_GIC
+        select HAVE_SMP
         select LOCAL_TIMERS if SMP
         select PL310_ERRATA_588369
         select PL310_ERRATA_727915
diff --git a/arch/arm/mach-realview/Kconfig b/arch/arm/mach-realview/Kconfig
index dba6d0c1fc1..c593be428b8 100644
--- a/arch/arm/mach-realview/Kconfig
+++ b/arch/arm/mach-realview/Kconfig
@@ -12,6 +12,8 @@ config REALVIEW_EB_A9MP
         bool "Support Multicore Cortex-A9 Tile"
         depends on MACH_REALVIEW_EB
         select CPU_V7
+        select HAVE_SMP
+        select MIGHT_HAVE_CACHE_L2X0
         help
           Enable support for the Cortex-A9MPCore tile fitted to the
           Realview(R) Emulation Baseboard platform.
@@ -21,6 +23,8 @@ config REALVIEW_EB_ARM11MP
         depends on MACH_REALVIEW_EB
         select CPU_V6K
         select ARCH_HAS_BARRIERS if SMP
+        select HAVE_SMP
+        select MIGHT_HAVE_CACHE_L2X0
         help
           Enable support for the ARM11MPCore tile fitted to the Realview(R)
           Emulation Baseboard platform.
@@ -39,6 +43,8 @@ config MACH_REALVIEW_PB11MP
         select CPU_V6K
         select ARM_GIC
         select HAVE_PATA_PLATFORM
+        select HAVE_SMP
+        select MIGHT_HAVE_CACHE_L2X0
         select ARCH_HAS_BARRIERS if SMP
         help
           Include support for the ARM(R) RealView(R) Platform Baseboard for
@@ -51,6 +57,7 @@ config MACH_REALVIEW_PB1176
         select CPU_V6
         select ARM_GIC
         select HAVE_TCM
+        select MIGHT_HAVE_CACHE_L2X0
         help
           Include support for the ARM(R) RealView(R) Platform Baseboard for
           ARM1176JZF-S.
@@ -78,6 +85,8 @@ config MACH_REALVIEW_PBX
         bool "Support RealView(R) Platform Baseboard Explore"
         select ARM_GIC
         select HAVE_PATA_PLATFORM
+        select HAVE_SMP
+        select MIGHT_HAVE_CACHE_L2X0
         select ARCH_SPARSEMEM_ENABLE if CPU_V7 && !REALVIEW_HIGH_PHYS_OFFSET
         select ZONE_DMA if SPARSEMEM
         help
diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig
index 931148487f0..9b3d0fbaee7 100644
--- a/arch/arm/mach-vexpress/Kconfig
+++ b/arch/arm/mach-vexpress/Kconfig
@@ -8,5 +8,7 @@ config ARCH_VEXPRESS_CA9X4
         select ARM_ERRATA_720789
         select ARM_ERRATA_751472
         select ARM_ERRATA_753970
+        select HAVE_SMP
+        select MIGHT_HAVE_CACHE_L2X0
 
 endmenu
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index 5cf7922ff5e..4cefb57d9ed 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -833,14 +833,23 @@ config CACHE_FEROCEON_L2_WRITETHROUGH
           Say Y here to use the Feroceon L2 cache in writethrough mode.
           Unless you specifically require this, say N for writeback mode.
 
+config MIGHT_HAVE_CACHE_L2X0
+        bool
+        help
+          This option should be selected by machines which have a L2x0
+          or PL310 cache controller, but where its use is optional.
+
+          The only effect of this option is to make CACHE_L2X0 and
+          related options available to the user for configuration.
+
+          Boards or SoCs which always require the cache controller
+          support to be present should select CACHE_L2X0 directly
+          instead of this option, thus preventing the user from
+          inadvertently configuring a broken kernel.
+
 config CACHE_L2X0
-        bool "Enable the L2x0 outer cache controller"
-        depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \
-                   REALVIEW_EB_A9MP || ARCH_IMX_V6_V7 || MACH_REALVIEW_PBX || \
-                   ARCH_NOMADIK || ARCH_OMAP4 || ARCH_EXYNOS4 || ARCH_TEGRA || \
-                   ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE || \
-                   ARCH_PRIMA2 || ARCH_ZYNQ || ARCH_CNS3XXX || ARCH_HIGHBANK
-        default y
+        bool "Enable the L2x0 outer cache controller" if MIGHT_HAVE_CACHE_L2X0
+        default MIGHT_HAVE_CACHE_L2X0
         select OUTER_CACHE
         select OUTER_CACHE_SYNC
         help
diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
index b3a1f2b3ada..b30708e28c1 100644
--- a/arch/arm/plat-mxc/Kconfig
+++ b/arch/arm/plat-mxc/Kconfig
@@ -20,6 +20,7 @@ config ARCH_IMX_V6_V7
         bool "i.MX3, i.MX6"
         select AUTO_ZRELADDR if !ZBOOT_ROM
         select ARM_PATCH_PHYS_VIRT
+        select MIGHT_HAVE_CACHE_L2X0
         help
           This enables support for systems based on the Freescale i.MX3 and i.MX6
           family.