aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-keystone/Kconfig
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2014-03-04 21:31:54 -0500
committerShawn Guo <shawn.guo@linaro.org>2014-03-04 21:31:54 -0500
commitc1b2a174c33ae2bd453e40199de4f93c684500e6 (patch)
tree9d9cecb2a54ef223969dfced6eeff4639a080b8c /arch/arm/mach-keystone/Kconfig
parentcfbf8d4857c26a8a307fb7cd258074c9dcd8c691 (diff)
parent4b8b5f25b7485eaf60a40f68451b3b7b741eef59 (diff)
Merge tag 'kconfig-cleanup-for-3.15' into imx/soc
- Remove common kconfig options required by multi-platform builds out of individual platforms as they are redundant. - Make SMP, CACHE_L2X0 and GPIO config options user visible on multi-platform builds as most platforms enable these options and all platforms can run with them enabled. - Make multi-platform v6 default to more optimal v6k rather than v6 - Remove the last bit of mach-virt and convert it to just a kconfig option. Conflicts: arch/arm/mach-omap2/Kconfig
Diffstat (limited to 'arch/arm/mach-keystone/Kconfig')
-rw-r--r--arch/arm/mach-keystone/Kconfig4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-keystone/Kconfig b/arch/arm/mach-keystone/Kconfig
index 90a708fef541..f50bc936cb84 100644
--- a/arch/arm/mach-keystone/Kconfig
+++ b/arch/arm/mach-keystone/Kconfig
@@ -1,13 +1,9 @@
1config ARCH_KEYSTONE 1config ARCH_KEYSTONE
2 bool "Texas Instruments Keystone Devices" 2 bool "Texas Instruments Keystone Devices"
3 depends on ARCH_MULTI_V7 3 depends on ARCH_MULTI_V7
4 select CPU_V7
5 select ARM_GIC 4 select ARM_GIC
6 select HAVE_ARM_ARCH_TIMER 5 select HAVE_ARM_ARCH_TIMER
7 select HAVE_SMP
8 select CLKSRC_MMIO 6 select CLKSRC_MMIO
9 select GENERIC_CLOCKEVENTS
10 select ARCH_WANT_OPTIONAL_GPIOLIB
11 select ARM_ERRATA_798181 if SMP 7 select ARM_ERRATA_798181 if SMP
12 select COMMON_CLK_KEYSTONE 8 select COMMON_CLK_KEYSTONE
13 select ARCH_SUPPORTS_BIG_ENDIAN 9 select ARCH_SUPPORTS_BIG_ENDIAN