arm: vt8500: Remove single platform Kconfig options

Single-platform Kconfig options are removed, making arch-vt8500
multiplatform only.

Signed-off-by: Tony Prisk <linux@prisktech.co.nz>

2 files changed, 8 insertions, 19 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f95ba14ae3d0..76efd438a140 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -950,22 +950,6 @@ config ARCH_OMAP
         help
           Support for TI's OMAP platform (OMAP1/2/3/4).
 
-config ARCH_VT8500_SINGLE
-        bool "VIA/WonderMedia 85xx"
-        select ARCH_HAS_CPUFREQ
-        select ARCH_REQUIRE_GPIOLIB
-        select CLKDEV_LOOKUP
-        select COMMON_CLK
-        select CPU_ARM926T
-        select GENERIC_CLOCKEVENTS
-        select GENERIC_GPIO
-        select HAVE_CLK
-        select MULTI_IRQ_HANDLER
-        select SPARSE_IRQ
-        select USE_OF
-        help
-          Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip.
-
 endchoice
 
 menu "Multiple platform selection"
diff --git a/arch/arm/mach-vt8500/Kconfig b/arch/arm/mach-vt8500/Kconfig
index 2ed0b7d95db6..cdcc4329b4a8 100644
--- a/arch/arm/mach-vt8500/Kconfig
+++ b/arch/arm/mach-vt8500/Kconfig
@@ -1,12 +1,17 @@
 config ARCH_VT8500
-        bool "VIA/WonderMedia 85xx" if ARCH_MULTI_V5
-        default ARCH_VT8500_SINGLE
+        bool
         select ARCH_HAS_CPUFREQ
         select ARCH_REQUIRE_GPIOLIB
         select CLKDEV_LOOKUP
-        select CPU_ARM926T
         select GENERIC_CLOCKEVENTS
         select GENERIC_GPIO
         select HAVE_CLK
         help
           Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip.
+
+config ARCH_WM8505
+        bool "VIA/Wondermedia 85xx and WM8650"
+        depends on ARCH_MULTI_V5
+        select ARCH_VT8500
+        select CPU_ARM926T
+        help