Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze

[oweals/u-boot.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2167e29f6aba525f61f92635f1017e8699232668..00be305c390c796063198c9fbc2fb0f7a72faaac 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -649,7 +649,7 @@ config TARGET_COLIBRI_VF
        bool "Support Colibri VF50/61"
        select CPU_V7
 
-config ZYNQ
+config ARCH_ZYNQ
        bool "Xilinx Zynq Platform"
        select CPU_V7
        select SUPPORT_SPL
@@ -837,7 +837,7 @@ source "arch/arm/mach-uniphier/Kconfig"
 
 source "arch/arm/mach-versatile/Kconfig"
 
-source "arch/arm/cpu/armv7/zynq/Kconfig"
+source "arch/arm/mach-zynq/Kconfig"
 
 source "arch/arm/cpu/armv7/Kconfig"