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

diff --combined include/configs/xilinx_zynqmp.h
index 474bbaff059da74910e815ddeced0e75f852834e,1546e8b6f99ec5e237fcca7c589a6fe90392d2fe..50ac5f531c49c135c06ab0d1e1944104b13a8f41
--- 1/include/configs/xilinx_zynqmp.h
--- 2/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@@ -107,14 -107,6 +107,14 @@@
  #define CONFIG_SYS_LOAD_ADDR          0x8000000
  
  #if defined(CONFIG_ZYNQMP_USB)
 +#define CONFIG_USB_XHCI_DWC3
 +#define CONFIG_USB_XHCI
 +#define CONFIG_USB_MAX_CONTROLLER_COUNT         1
 +#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS      2
 +#define CONFIG_CMD_USB
 +#define CONFIG_USB_STORAGE
 +#define CONFIG_USB_XHCI_ZYNQMP
 +
  #define CONFIG_USB_DWC3
  #define CONFIG_USB_DWC3_GADGET
  
@@@ -184,10 -176,8 +184,8 @@@
  #define CONFIG_SYS_MAXARGS            64
  
  /* Ethernet driver */
- #if defined(CONFIG_ZYNQ_GEM0) || defined(CONFIG_ZYNQ_GEM1) || \
-       defined(CONFIG_ZYNQ_GEM2) || defined(CONFIG_ZYNQ_GEM3)
+ #if defined(CONFIG_ZYNQ_GEM)
  # define CONFIG_NET_MULTI
- # define CONFIG_ZYNQ_GEM
  # define CONFIG_MII
  # define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
  # define CONFIG_PHYLIB
@@@ -224,9 -214,6 +222,6 @@@
  #define CONFIG_CMD_SCSI
  #endif
  
- #define CONFIG_FIT
- #define CONFIG_FIT_VERBOSE       /* enable fit_format_{error,warning}() */
- 
  #define CONFIG_SYS_BOOTM_LEN  (60 * 1024 * 1024)
  
  #define CONFIG_CMD_BOOTI

diff --combined include/configs/xilinx_zynqmp_ep.h
index b7d506e5e7268ed4a69834795d6176a443810d61,e9b904bcdc388bf39363183567b605ec5dfd726b..ec39211af3db5a9c605e2ec6fe26b253a4f593da
--- 1/include/configs/xilinx_zynqmp_ep.h
--- 2/include/configs/xilinx_zynqmp_ep.h
+++ b/include/configs/xilinx_zynqmp_ep.h
@@@ -15,17 -15,12 +15,14 @@@
  #ifndef __CONFIG_ZYNQMP_EP_H
  #define __CONFIG_ZYNQMP_EP_H
  
- #define CONFIG_ZYNQ_GEM0
- #define CONFIG_ZYNQ_GEM_PHY_ADDR0     7
- 
  #define CONFIG_ZYNQ_SDHCI0
  #define CONFIG_ZYNQ_SDHCI_MAX_FREQ    52000000
  #define CONFIG_ZYNQ_I2C0
  #define CONFIG_SYS_I2C_ZYNQ
  #define CONFIG_ZYNQ_EEPROM
  #define CONFIG_AHCI
 +#define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR, \
 +                               ZYNQMP_USB1_XHCI_BASEADDR}
  
  #include <configs/xilinx_zynqmp.h>