summaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2012-09-06 13:43:04 -0500
committerRob Herring <rob.herring@calxeda.com>2012-09-14 12:55:09 -0500
commit617276307cd4cdb9a95c77efaa3063695af63aa7 (patch)
treeae1ec64138ed1bec2be0a402e90724b0db31afa6 /arch/arm/Kconfig
parent387798b37c8dd0ae24c0ac12ba456dd76865bca3 (diff)
downloadlinux-617276307cd4cdb9a95c77efaa3063695af63aa7.tar.bz2
ARM: vexpress: convert to multi-platform
Convert vexpress to multi-platform. This always enables vexpress DT and makes it the default v7 platform. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Cc: Pawel Moll <pawel.moll@arm.com>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig19
1 files changed, 1 insertions, 18 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ebaf08849f96..16773aa39513 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -319,24 +319,6 @@ config ARCH_VERSATILE
help
This enables support for ARM Ltd Versatile board.
-config ARCH_VEXPRESS
- bool "ARM Ltd. Versatile Express family"
- select ARCH_WANT_OPTIONAL_GPIOLIB
- select ARM_AMBA
- select ARM_TIMER_SP804
- select CLKDEV_LOOKUP
- select COMMON_CLK
- select GENERIC_CLOCKEVENTS
- select HAVE_CLK
- select HAVE_PATA_PLATFORM
- select ICST
- select NO_IOPORT
- select PLAT_VERSATILE
- select PLAT_VERSATILE_CLCD
- select REGULATOR_FIXED_VOLTAGE if REGULATOR
- help
- This enables support for the ARM Ltd Versatile Express boards.
-
config ARCH_AT91
bool "Atmel AT91"
select ARCH_REQUIRE_GPIOLIB
@@ -1016,6 +998,7 @@ config ARCH_MULTI_V6
config ARCH_MULTI_V7
bool "ARMv7 based platforms (Cortex-A, PJ4, Krait)"
select CPU_V7
+ select ARCH_VEXPRESS
default y
select ARCH_MULTI_V6_V7