Merge branch 'master' of git://git.denx.de/u-boot-spi

diff --combined include/configs/zynq-common.h
index 638be2f,229bc7a..4a81d41
--- 1/include/configs/zynq-common.h
--- 2/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@@ -50,7 -50,6 +50,7 @@@
  # define CONFIG_MII
  # define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
  # define CONFIG_PHY_MARVELL
 +# define CONFIG_PHY_REALTEK
  # define CONFIG_BOOTP_SERVERIP
  # define CONFIG_BOOTP_BOOTPATH
  # define CONFIG_BOOTP_GATEWAY
@@@ -87,10 -86,11 +87,10 @@@
  #endif
  
  /* MMC */
 -#if defined(CONFIG_ZYNQ_SDHCI0) || defined(CONFIG_ZYNQ_SDHCI1)
 +#if defined(CONFIG_ZYNQ_SDHCI)
  # define CONFIG_MMC
  # define CONFIG_GENERIC_MMC
  # define CONFIG_SDHCI
 -# define CONFIG_ZYNQ_SDHCI
  # define CONFIG_CMD_MMC
  # define CONFIG_ZYNQ_SDHCI_MAX_FREQ   52000000
  #endif
@@@ -131,7 -131,7 +131,7 @@@
        "dfu_ram=run dfu_ram_info && dfu 0 ram 0\0" \
        "thor_ram=run dfu_ram_info && thordown 0 ram 0\0"
  
 -# if defined(CONFIG_ZYNQ_SDHCI0) || defined(CONFIG_ZYNQ_SDHCI1)
 +# if defined(CONFIG_ZYNQ_SDHCI)
  #  define CONFIG_DFU_MMC
  #  define DFU_ALT_INFO_MMC \
        "dfu_mmc_info=" \
@@@ -197,7 -197,11 +197,11 @@@
  /* Environment */
  #ifndef CONFIG_ENV_IS_NOWHERE
  # ifndef CONFIG_SYS_NO_FLASH
+ /* Environment in NOR flash */
  #  define CONFIG_ENV_IS_IN_FLASH
+ # elif defined(CONFIG_ZYNQ_QSPI)
+ /* Environment in Serial Flash */
+ #  define CONFIG_ENV_IS_IN_SPI_FLASH
  # elif defined(CONFIG_SYS_NO_FLASH)
  #  define CONFIG_ENV_IS_NOWHERE
  # endif
@@@ -227,7 -231,8 +231,7 @@@
        "usbboot=if usb start; then " \
                        "echo Copying FIT from USB to RAM... && " \
                        "load usb 0 ${load_addr} ${fit_image} && " \
 -                      "bootm ${load_addr}\0" \
 -              "fi\0" \
 +                      "bootm ${load_addr}; fi\0" \
                DFU_ALT_INFO
  
  #define CONFIG_BOOTCOMMAND            "run $modeboot"
@@@ -287,7 -292,9 +291,7 @@@
  #define CONFIG_SYS_BOOTM_LEN  (60 * 1024 * 1024)
  
  /* Boot FreeBSD/vxWorks from an ELF image */
 -#if defined(CONFIG_ZYNQ_BOOT_FREEBSD)
 -# define CONFIG_SYS_MMC_MAX_DEVICE    1
 -#endif
 +#define CONFIG_SYS_MMC_MAX_DEVICE     1
  
  #define CONFIG_SYS_LDSCRIPT  "arch/arm/mach-zynq/u-boot.lds"
  
@@@ -304,12 -311,11 +308,12 @@@
  #define CONFIG_SPL_LIBGENERIC_SUPPORT
  #define CONFIG_SPL_SERIAL_SUPPORT
  #define CONFIG_SPL_BOARD_INIT
 +#define CONFIG_SPL_RAM_DEVICE
  
  #define CONFIG_SPL_LDSCRIPT   "arch/arm/mach-zynq/u-boot-spl.lds"
  
  /* MMC support */
 -#ifdef CONFIG_ZYNQ_SDHCI0
 +#ifdef CONFIG_ZYNQ_SDHCI
  #define CONFIG_SPL_MMC_SUPPORT
  #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */
  #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS      0x200 /* 256 KB */