Xilinx: ARM: Prepare Kconfig for COMMON_CLK

Selecting Zynq as target architecture adds the common clock framework.
Selecting Zynq as target architecture was dependent on plat-versatile, which
lead to compile errors in combination with COMMON_CLK. Removing this dependency
fixes this issue.

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 5052aa7bf64b2ca2a43cbf4fcb0b2f1ee071ffaa..6b2aa293e1ad4a126ac2d06764ea877aae1a1b4c 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -982,6 +982,7 @@ config ARCH_ZYNQ
        select CACHE_L2X0
        select ISA_DMA_API
        select ARCH_REQUIRE_GPIOLIB
+       select COMMON_CLK
        help
          Support for Xilinx Zynq ARM Cortex A9 Platform
 endchoice

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 0298b00fe2413a1964cd899b9834136c3166136a..2e1583da561c74baf197823c5a1e0db908d281c3 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -199,7 +199,6 @@ machine-$(CONFIG_ARCH_ZYNQ)         := zynq
 plat-$(CONFIG_ARCH_MXC)                := mxc
 plat-$(CONFIG_ARCH_OMAP)       := omap
 plat-$(CONFIG_ARCH_S3C64XX)    := samsung
-plat-$(CONFIG_ARCH_ZYNQ)       := versatile
 plat-$(CONFIG_PLAT_IOP)                := iop
 plat-$(CONFIG_PLAT_NOMADIK)    := nomadik
 plat-$(CONFIG_PLAT_ORION)      := orion