summaryrefslogtreecommitdiff
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorStefano Babic <sbabic@denx.de>2015-03-05 16:05:10 +0100
committerStefano Babic <sbabic@denx.de>2015-03-05 16:05:10 +0100
commit9b5b60a05cb8bba2d135439419b2030764e359bd (patch)
tree15e249ac39e9c547668327218e63a0faf54a3283 /arch/arm/Kconfig
parent32df39c741788e8637cffe6633d73594b26d70fb (diff)
parent7ae8350f67eea861280a4cbd2d067777a0e87153 (diff)
downloadu-boot-imx-9b5b60a05cb8bba2d135439419b2030764e359bd.zip
u-boot-imx-9b5b60a05cb8bba2d135439419b2030764e359bd.tar.gz
u-boot-imx-9b5b60a05cb8bba2d135439419b2030764e359bd.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index eb92297..8472d41 100644
--- 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"