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>

1 files changed, 32 insertions, 32 deletions

diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig
index fc3730f01650..c95296066203 100644
--- a/arch/arm/mach-vexpress/Kconfig
+++ b/arch/arm/mach-vexpress/Kconfig
@@ -1,38 +1,23 @@
-menu "Versatile Express platform type"
-        depends on ARCH_VEXPRESS
-
-config ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA
-        bool "Enable A5 and A9 only errata work-arounds"
-        default y
-        select ARM_ERRATA_720789
-        select ARM_ERRATA_751472
-        select PL310_ERRATA_753970 if CACHE_PL310
-        help
-          Provides common dependencies for Versatile Express platforms
-          based on Cortex-A5 and Cortex-A9 processors. In order to
-          build a working kernel, you must also enable relevant core
-          tile support or Flattened Device Tree based support options.
-
-config ARCH_VEXPRESS_CA9X4
-        bool "Versatile Express Cortex-A9x4 tile"
-        select ARM_GIC
-        select CPU_V7
-        select HAVE_SMP
-        select MIGHT_HAVE_CACHE_L2X0
-
-config ARCH_VEXPRESS_DT
-        bool "Device Tree support for Versatile Express platforms"
+config ARCH_VEXPRESS
+        bool "ARM Ltd. Versatile Express family" if ARCH_MULTI_V7
+        select ARCH_WANT_OPTIONAL_GPIOLIB
+        select ARM_AMBA
         select ARM_GIC
-        select ARM_PATCH_PHYS_VIRT
-        select AUTO_ZRELADDR
+        select ARM_TIMER_SP804
+        select CLKDEV_LOOKUP
+        select COMMON_CLK
         select CPU_V7
+        select GENERIC_CLOCKEVENTS
+        select HAVE_CLK
+        select HAVE_PATA_PLATFORM
         select HAVE_SMP
+        select ICST
         select MIGHT_HAVE_CACHE_L2X0
-        select USE_OF
+        select NO_IOPORT
+        select PLAT_VERSATILE
+        select PLAT_VERSATILE_CLCD
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
         help
-          New Versatile Express platforms require Flattened Device Tree to
-          be passed to the kernel.
-
           This option enables support for systems using Cortex processor based
           ARM core and logic (FPGA) tiles on the Versatile Express motherboard,
           for example:
@@ -48,7 +33,22 @@ config ARCH_VEXPRESS_DT
           platforms. The traditional (ATAGs) boot method is not usable on
           these boards with this option.
 
-          If your bootloader supports Flattened Device Tree based booting,
-          say Y here.
+menu "Versatile Express platform type"
+        depends on ARCH_VEXPRESS
+
+config ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA
+        bool "Enable A5 and A9 only errata work-arounds"
+        default y
+        select ARM_ERRATA_720789
+        select ARM_ERRATA_751472
+        select PL310_ERRATA_753970 if CACHE_PL310
+        help
+          Provides common dependencies for Versatile Express platforms
+          based on Cortex-A5 and Cortex-A9 processors. In order to
+          build a working kernel, you must also enable relevant core
+          tile support or Flattened Device Tree based support options.
+
+config ARCH_VEXPRESS_CA9X4
+        bool "Versatile Express Cortex-A9x4 tile"
 
 endmenu