aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorRob Herring2015-12-08 14:44:18 -0600
committerArnd Bergmann2015-12-15 23:54:48 +0100
commita29da136de345f074d0c64f1c3b38eef30116b32 (patch)
tree28d16e8a2529f3fea31e25c5356a7f5b688dc12a /arch/arm/Kconfig
parenta70967892111934e292485ce84f1bab38cc55380 (diff)
ARM: versatile: convert to multi-platform
Now that all the prerequisites are in place, we can enable Versatile boards for multi-platform kernels. Signed-off-by: Rob Herring <robh@kernel.org> Cc: Russell King <linux@arm.linux.org.uk> Cc: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig22
1 files changed, 2 insertions, 20 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 34e2162213cb..99414545fe23 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -362,26 +362,6 @@ config ARCH_REALVIEW
help
This enables support for ARM Ltd RealView boards.
-config ARCH_VERSATILE
- bool "ARM Ltd. Versatile family"
- select ARCH_WANT_OPTIONAL_GPIOLIB
- select ARM_AMBA
- select ARM_TIMER_SP804
- select ARM_VIC
- select CLKSRC_VERSATILE
- select COMMON_CLK
- select COMMON_CLK_VERSATILE
- select CPU_ARM926T
- select GENERIC_CLOCKEVENTS
- select ICST
- select PLAT_VERSATILE
- select MIGHT_HAVE_PCI
- select SPARSE_IRQ
- select USE_OF
- select VERSATILE_FPGA_IRQ
- help
- This enables support for ARM Ltd Versatile board.
-
config ARCH_CLPS711X
bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
select ARCH_REQUIRE_GPIOLIB
@@ -929,6 +909,8 @@ source "arch/arm/mach-uniphier/Kconfig"
source "arch/arm/mach-ux500/Kconfig"
+source "arch/arm/mach-versatile/Kconfig"
+
source "arch/arm/mach-vexpress/Kconfig"
source "arch/arm/plat-versatile/Kconfig"