Merge branch 'master' of git://git.denx.de/u-boot

[people/ms/u-boot.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index eb92297cb3b491630ab002190572810b81c1ddf3..8472d4156596887a980b8f69219c22390ab4f886 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -596,6 +596,10 @@ config ZYNQ
        select CPU_V7
        select SUPPORT_SPL
 
+config TARGET_XILINX_ZYNQMP
+       bool "Support Xilinx ZynqMP Platform"
+       select ARM64
+
 config TEGRA
        bool "NVIDIA Tegra"
        select SUPPORT_SPL
@@ -727,7 +731,7 @@ source "arch/arm/cpu/armv7/s5pc1xx/Kconfig"
 
 source "arch/arm/mach-tegra/Kconfig"
 
-source "arch/arm/cpu/armv7/uniphier/Kconfig"
+source "arch/arm/mach-uniphier/Kconfig"
 
 source "arch/arm/mach-versatile/Kconfig"
 
@@ -845,6 +849,7 @@ source "board/wandboard/Kconfig"
 source "board/warp/Kconfig"
 source "board/woodburn/Kconfig"
 source "board/xaeniax/Kconfig"
+source "board/xilinx/zynqmp/Kconfig"
 source "board/zipitz2/Kconfig"
 
 source "arch/arm/Kconfig.debug"