Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master'

diff --combined Makefile
index 176ce10a7284673408d5ba6742548fb141d4eeae,83d1cc66020b12cc7aadd1be722522a6bd6dfbfb..1f56e85910c907f08586afad757d64eebdc23efb
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -752,6 -752,9 +752,9 @@@ ALL-$(CONFIG_SPL) += spl/u-boot-spl.bi
  ALL-$(CONFIG_SPL_FRAMEWORK) += u-boot.img
  ALL-$(CONFIG_TPL) += tpl/u-boot-tpl.bin
  ALL-$(CONFIG_OF_SEPARATE) += u-boot.dtb u-boot-dtb.bin
+ ifeq ($(CONFIG_SPL_FRAMEWORK),y)
+ ALL-$(CONFIG_OF_SEPARATE) += u-boot-dtb.img
+ endif
  ALL-$(CONFIG_OF_HOSTFILE) += u-boot.dtb
  ifneq ($(CONFIG_SPL_TARGET),)
  ALL-$(CONFIG_SPL) += $(CONFIG_SPL_TARGET:"%"=%)
@@@ -854,6 -857,11 +857,11 @@@ MKIMAGEFLAGS_u-boot.pbl = -n $(srctree)
  u-boot.img u-boot.kwb u-boot.pbl: u-boot.bin FORCE
        $(call if_changed,mkimage)
  
+ MKIMAGEFLAGS_u-boot-dtb.img = $(MKIMAGEFLAGS_u-boot.img)
+ 
+ u-boot-dtb.img: u-boot-dtb.bin FORCE
+       $(call if_changed,mkimage)
+ 
  u-boot.sha1:  u-boot.bin
                tools/ubsha1 u-boot.bin
  
@@@ -893,7 -901,7 +901,7 @@@ MKIMAGEFLAGS_u-boot-spl.ais = -s -n $(i
  spl/u-boot-spl.ais: spl/u-boot-spl.bin FORCE
        $(call if_changed,mkimage)
  
 -OBJCOPYFLAGS_u-boot.ais = -I binary -O binary --pad-to=$(CONFIG_SPL_MAX_SIZE)
 +OBJCOPYFLAGS_u-boot.ais = -I binary -O binary --pad-to=$(CONFIG_SPL_PAD_TO)
  u-boot.ais: spl/u-boot-spl.ais u-boot.img FORCE
        $(call if_changed,pad_cat)
  

diff --combined include/configs/zynq-common.h
index 97632452f8210d5293cab2d70bf5bcb9072f43be,579091d6052094b33955ca737813b431f1d01142..dc5bc22ce9714dc09cc5757e74506cdf0b585bf2
--- 1/include/configs/zynq-common.h
--- 2/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@@ -83,10 -83,27 +83,27 @@@
  # define CONFIG_SDHCI
  # define CONFIG_ZYNQ_SDHCI
  # define CONFIG_CMD_MMC
- # define CONFIG_CMD_FAT
+ #endif
+ 
+ #ifdef CONFIG_ZYNQ_USB
+ # define CONFIG_USB_EHCI
+ # define CONFIG_CMD_USB
+ # define CONFIG_USB_STORAGE
+ # define CONFIG_USB_EHCI_ZYNQ
+ # define CONFIG_USB_ULPI_VIEWPORT
+ # define CONFIG_USB_ULPI
+ # define CONFIG_EHCI_IS_TDI
+ # define CONFIG_USB_MAX_CONTROLLER_COUNT      2
+ #endif
+ 
+ #if defined(CONFIG_ZYNQ_SDHCI) || defined(CONFIG_ZYNQ_USB)
  # define CONFIG_SUPPORT_VFAT
+ # define CONFIG_CMD_FAT
  # define CONFIG_CMD_EXT2
+ # define CONFIG_FAT_WRITE
  # define CONFIG_DOS_PARTITION
+ # define CONFIG_CMD_EXT4
+ # define CONFIG_CMD_EXT4_WRITE
  #endif
  
  #define CONFIG_SYS_I2C_ZYNQ
@@@ -150,7 -167,13 +167,13 @@@
                "bootm ${load_addr}\0" \
        "jtagboot=echo TFTPing FIT to RAM... && " \
                "tftpboot ${load_addr} ${fit_image} && " \
-               "bootm ${load_addr}\0"
+               "bootm ${load_addr}\0" \
+       "usbboot=if usb start; then " \
+                       "echo Copying FIT from USB to RAM... && " \
+                       "fatload usb 0 ${load_addr} ${fit_image} && " \
+                       "bootm ${load_addr}\0" \
+               "fi\0"
+ 
  #define CONFIG_BOOTCOMMAND            "run $modeboot"
  #define CONFIG_BOOTDELAY              3 /* -1 to Disable autoboot */
  #define CONFIG_SYS_LOAD_ADDR          0 /* default? */
@@@ -165,7 -188,7 +188,7 @@@
  #define CONFIG_SYS_LONGHELP
  #define CONFIG_CLOCKS
  #define CONFIG_CMD_CLK
- #define CONFIG_SYS_MAXARGS            15 /* max number of command args */
+ #define CONFIG_SYS_MAXARGS            32 /* max number of command args */
  #define CONFIG_SYS_CBSIZE             256 /* Console I/O Buffer Size */
  #define CONFIG_SYS_PBSIZE             (CONFIG_SYS_CBSIZE + \
                                        sizeof(CONFIG_SYS_PROMPT) + 16)
@@@ -191,10 -214,6 +214,10 @@@
  #define CONFIG_FPGA_XILINX
  #define CONFIG_FPGA_ZYNQPL
  #define CONFIG_CMD_FPGA
 +#define CONFIG_CMD_FPGA_LOADMK
 +#define CONFIG_CMD_FPGA_LOADP
 +#define CONFIG_CMD_FPGA_LOADBP
 +#define CONFIG_CMD_FPGA_LOADFS
  
  /* Open Firmware flat tree */
  #define CONFIG_OF_LIBFDT
@@@ -213,7 -232,7 +236,7 @@@
  #define CONFIG_RSA
  
  /* Extend size of kernel image for uncompression */
- #define CONFIG_SYS_BOOTM_LEN  (20 * 1024 * 1024)
+ #define CONFIG_SYS_BOOTM_LEN  (60 * 1024 * 1024)
  
  /* Boot FreeBSD/vxWorks from an ELF image */
  #if defined(CONFIG_ZYNQ_BOOT_FREEBSD)
@@@ -239,16 -258,10 +262,10 @@@
  #define CONFIG_SPL_LIBCOMMON_SUPPORT
  #define CONFIG_SPL_LIBGENERIC_SUPPORT
  #define CONFIG_SPL_SERIAL_SUPPORT
+ #define CONFIG_SPL_BOARD_INIT
  
  #define CONFIG_SPL_LDSCRIPT   "arch/arm/cpu/armv7/zynq/u-boot-spl.lds"
  
- /* Disable dcache for SPL just for sure */
- #ifdef CONFIG_SPL_BUILD
- #define CONFIG_SYS_DCACHE_OFF
- #undef CONFIG_FPGA
- #undef CONFIG_OF_CONTROL
- #endif
- 
  /* MMC support */
  #ifdef CONFIG_ZYNQ_SDHCI0
  #define CONFIG_SPL_MMC_SUPPORT
@@@ -257,7 -270,18 +274,18 @@@
  #define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION    1
  #define CONFIG_SPL_LIBDISK_SUPPORT
  #define CONFIG_SPL_FAT_SUPPORT
- #define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME     "u-boot.img"
+ #if defined(CONFIG_OF_CONTROL) && defined(CONFIG_OF_SEPARATE)
+ # define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME     "u-boot-dtb.img"
+ #else
+ # define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME     "u-boot.img"
+ #endif
+ #endif
+ 
+ /* Disable dcache for SPL just for sure */
+ #ifdef CONFIG_SPL_BUILD
+ #define CONFIG_SYS_DCACHE_OFF
+ #undef CONFIG_FPGA
+ #undef CONFIG_OF_CONTROL
  #endif
  
  /* Address in RAM where the parameters must be copied by SPL. */