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

diff --combined MAINTAINERS
index 820142e,1b5b155..68f3504
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -148,7 -148,7 +148,7 @@@ F: arch/arm/mach-tegra
  F:    arch/arm/include/asm/arch-tegra*/
  
  ARM TI
 -M:    Tom Rini <trini@ti.com>
 +M:    Tom Rini <trini@konsulko.com>
  S:    Maintained
  T:    git git://git.denx.de/u-boot-ti.git
  F:    arch/arm/cpu/arm926ejs/davinci/
@@@ -162,7 -162,8 +162,7 @@@ ARM UNIPHIE
  M:    Masahiro Yamada <yamada.m@jp.panasonic.com>
  S:    Maintained
  T:    git git://git.denx.de/u-boot-uniphier.git
 -F:    arch/arm/cpu/armv7/uniphier/
 -F:    arch/arm/include/asm/arch-uniphier/
 +F:    arch/arm/mach-uniphier/
  F:    configs/ph1_*_defconfig
  N:    uniphier
  
@@@ -172,6 -173,12 +172,12 @@@ S:       Maintaine
  F:    arch/arm/cpu/armv7/zynq/
  F:    arch/arm/include/asm/arch-zynq/
  
+ ARM ZYNQMP
+ M:    Michal Simek <michal.simek@xilinx.com>
+ S:    Maintained
+ F:    arch/arm/cpu/armv8/zynqmp/
+ F:    arch/arm/include/asm/arch-zynqmp/
+ 
  AVR32
  M:    Andreas Bießmann <andreas.devel@googlemail.com>
  S:    Maintained
@@@ -208,7 -215,6 +214,7 @@@ M: Lukasz Majewski <l.majewski@samsung.
  S:    Maintained
  T:    git git://git.denx.de/u-boot-dfu.git
  F:    drivers/dfu/
 +F:    drivers/usb/gadget/
  
  DRIVER MODEL
  M:    Simon Glass <sjg@chromium.org>
@@@ -411,7 -417,7 +417,7 @@@ T: git git://git.denx.de/u-boot-x86.gi
  F:    arch/x86/
  
  THE REST
 -M:    Tom Rini <trini@ti.com>
 +M:    Tom Rini <trini@konsulko.com>
  L:    u-boot@lists.denx.de
  Q:    http://patchwork.ozlabs.org/project/uboot/list/
  S:    Maintained

diff --combined arch/arm/Kconfig
index 2265afb,5e255cb..bc55e5b
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -592,6 -592,10 +592,10 @@@ config ZYN
        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
@@@ -723,7 -727,7 +727,7 @@@ source "arch/arm/cpu/armv7/s5pc1xx/Kcon
  
  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"
  
@@@ -840,6 -844,7 +844,7 @@@ source "board/vpac270/Kconfig
  source "board/wandboard/Kconfig"
  source "board/woodburn/Kconfig"
  source "board/xaeniax/Kconfig"
+ source "board/xilinx/zynqmp/Kconfig"
  source "board/zipitz2/Kconfig"
  
  source "arch/arm/Kconfig.debug"