From: Tom Rini <trini@konsulko.com>
Date: Mon, 9 Apr 2018 15:06:21 +0000 (-0400)
Subject: Merge tag 'xilinx-for-v2018.05-rc2' of git://git.denx.de/u-boot-microblaze
X-Git-Tag: v2018.05-rc2~44
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2600df4f8ef12ece9cec13030005919e0ba2b0d5;hp=-c;p=u-boot

Merge tag 'xilinx-for-v2018.05-rc2' of git://git.denx.de/u-boot-microblaze

Xilinx changes for v2018.05-rc2

- Various DT changes and sync with mainline kernel
- Various defconfig updates
- Add SPL init for zcu102 revA
- Add new zynqmp boards zcu100/zcu104/zcu106/zcu111/zc12XX
  and zc1751-dc3
- Net fixes - xlnx,phy-type
- 64bit axi ethernet support
- arasan: Fix nand write issue
- fpga fixes
- Maintainer file updates
---

2600df4f8ef12ece9cec13030005919e0ba2b0d5
diff --combined MAINTAINERS
index bf2a84c7e1,4337c6da6b..2e75f396e1
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -264,7 -264,7 +264,7 @@@ F:	drivers/spi/zynq_qspi.
  F:	drivers/spi/zynq_spi.c
  F:	drivers/usb/host/ehci-zynq.c
  F:	drivers/watchdog/cdns_wdt.c
- F:	include/zynqmp.h
+ F:	include/zynqpl.h
  F:	tools/zynqimage.c
  N:	zynq
  
@@@ -273,7 -273,7 +273,7 @@@ M:	Michal Simek <michal.simek@xilinx.co
  S:	Maintained
  T:	git git://git.denx.de/u-boot-microblaze.git
  F:	arch/arm/mach-zynq/
- F:	drivers/clk/clk_zynq.c
+ F:	drivers/clk/clk_zynqmp.c
  F:	drivers/fpga/zynqpl.c
  F:	drivers/gpio/zynq_gpio.c
  F:	drivers/i2c/i2c-cdns.c
@@@ -288,7 -288,7 +288,7 @@@ F:	drivers/spi/zynq_qspi.
  F:	drivers/spi/zynq_spi.c
  F:	drivers/usb/host/ehci-zynq.c
  F:	drivers/watchdog/cdns_wdt.c
- F:	include/zynqmp.h
+ F:	include/zynqmppl.h
  F:	tools/zynqimage.c
  N:	zynqmp
  
@@@ -330,7 -330,7 +330,7 @@@ EFI PAYLOA
  M:	Alexander Graf <agraf@suse.de>
  S:	Maintained
  T:	git git://github.com/agraf/u-boot.git
 -F:	doc/README.efi
 +F:	doc/README.uefi
  F:	doc/README.iscsi
  F:	include/efi*
  F:	include/pe.h