Merge tag 'v2019.01-rc3' into master

Prepare v2019.01-rc3

CONFIG_USB_STORAGE is removed from zc702/zc706_eeprom because it is
selected automatically.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --cc Makefile
index 552687db5385b4b04e4181283fd849557c702a39,eeb299fc380e0e24fc399860957c7f8edb497b03..eeb299fc380e0e24fc399860957c7f8edb497b03
mode 100755,100644..100755
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile

diff --cc arch/arm/dts/Makefile
Simple merge

diff --cc arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts
Simple merge

diff --cc configs/avnet_ultra96_rev1_defconfig
index 2a1059a47aa8aa8f21c13b501c351ccf36a0473c,5b5af16df5b13c69fef88f22cd714ab39aa1e10e..347d941e1511f556d27a0cf1700ba0fb996b477b
--- 1/configs/avnet_ultra96_rev1_defconfig
--- 2/configs/avnet_ultra96_rev1_defconfig
+++ b/configs/avnet_ultra96_rev1_defconfig
@@@ -91,5 -89,8 +90,6 @@@ CONFIG_USB_ETHER=
  CONFIG_USB_ETH_CDC=y
  CONFIG_USB_HOST_ETHER=y
  CONFIG_USB_ETHER_ASIX=y
 -CONFIG_WDT=y
 -CONFIG_WDT_CDNS=y
+ CONFIG_SPL_GZIP=y
  CONFIG_OF_LIBFDT_OVERLAY=y
  CONFIG_EFI_LOADER_BOUNCE_BUFFER=y

diff --cc configs/syzygy_hub_defconfig
Simple merge

diff --cc configs/topic_miami_defconfig
Simple merge

diff --cc configs/topic_miamilite_defconfig
Simple merge

diff --cc configs/topic_miamiplus_defconfig
Simple merge

diff --cc configs/xilinx_zynqmp_mini_qspi_defconfig
Simple merge

diff --cc configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
Simple merge

diff --cc configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
Simple merge

diff --cc configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig
Simple merge

diff --cc configs/xilinx_zynqmp_zcu100_revC_defconfig
index c81b50d636dce2634f5c5a02275101db78afd3c8,53bca780aff534eea5790aac208059d848cc6976..c5e1fdae1f10f6844a35d522d10621d2263b30ee
--- 1/configs/xilinx_zynqmp_zcu100_revC_defconfig
--- 2/configs/xilinx_zynqmp_zcu100_revC_defconfig
+++ b/configs/xilinx_zynqmp_zcu100_revC_defconfig
@@@ -91,5 -89,8 +90,6 @@@ CONFIG_USB_ETHER=
  CONFIG_USB_ETH_CDC=y
  CONFIG_USB_HOST_ETHER=y
  CONFIG_USB_ETHER_ASIX=y
 -CONFIG_WDT=y
 -CONFIG_WDT_CDNS=y
+ CONFIG_SPL_GZIP=y
  CONFIG_OF_LIBFDT_OVERLAY=y
  CONFIG_EFI_LOADER_BOUNCE_BUFFER=y

diff --cc configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
Simple merge

diff --cc configs/xilinx_zynqmp_zcu102_revA_defconfig
Simple merge

diff --cc configs/xilinx_zynqmp_zcu102_revB_defconfig
Simple merge

diff --cc configs/xilinx_zynqmp_zcu104_revA_defconfig
Simple merge

diff --cc configs/xilinx_zynqmp_zcu104_revC_defconfig
Simple merge

diff --cc configs/xilinx_zynqmp_zcu106_revA_defconfig
Simple merge

diff --cc configs/xilinx_zynqmp_zcu111_revA_defconfig
Simple merge

diff --cc configs/zynq_cc108_defconfig
Simple merge

diff --cc configs/zynq_cse_nor_defconfig
index 331a2783817776ee9f8bf1cba24fc0587959ffe0,b3bfc8c9ae39bbdf75a2e0c55e418da6bb9b7f4b..cf2121630a3a46182421832335512037a820f911
--- 1/configs/zynq_cse_nor_defconfig
--- 2/configs/zynq_cse_nor_defconfig
+++ b/configs/zynq_cse_nor_defconfig
@@@ -6,8 -6,6 +6,7 @@@ CONFIG_ENV_SIZE=0x19
  CONFIG_SPL=y
  CONFIG_SPL_STACK_R_ADDR=0x200000
  CONFIG_SYS_MALLOC_LEN=0x1000
- CONFIG_BOOTDELAY=-1
 +CONFIG_ZYNQ_M29EW_WB_HACK=y
  # CONFIG_BOARD_LATE_INIT is not set
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_SPL_STACK_R=y

diff --cc configs/zynq_cse_qspi_defconfig
Simple merge

diff --cc configs/zynq_dlc20_rev1_0_defconfig
Simple merge

diff --cc configs/zynq_microzed_defconfig
Simple merge

diff --cc configs/zynq_minized_defconfig
Simple merge

diff --cc configs/zynq_picozed_defconfig
Simple merge

diff --cc configs/zynq_z_turn_defconfig
Simple merge

diff --cc configs/zynq_zc702_RSA_defconfig
index 4b5192cf171f2667fc30aad873a9c568aed791a6,0000000000000000000000000000000000000000..3bcd24fb63ec7de7259b4ff76ca7dff14e7fd319
mode 100644,000000..100644
--- 1/configs/zynq_zc702_RSA_defconfig
--- /dev/null
+++ b/configs/zynq_zc702_RSA_defconfig
@@@ -1,83 -1,0 +1,82 @@@
- CONFIG_USB_STORAGE=y
 +CONFIG_ARM=y
 +CONFIG_SYS_CONFIG_NAME="zynq_zc70x"
 +CONFIG_ARCH_ZYNQ=y
 +CONFIG_SYS_TEXT_BASE=0x4000000
 +CONFIG_SYS_MALLOC_F_LEN=0x800
 +CONFIG_SPL=y
 +CONFIG_DEBUG_UART_BASE=0xe0001000
 +CONFIG_DEBUG_UART_CLOCK=50000000
 +CONFIG_IDENT_STRING=" Xilinx Zynq ZC702"
 +CONFIG_SPL_STACK_R_ADDR=0x200000
 +CONFIG_CMD_ZYNQ_AES=y
 +CONFIG_DEBUG_UART=y
 +CONFIG_DISTRO_DEFAULTS=y
 +CONFIG_FIT=y
 +CONFIG_FIT_SIGNATURE=y
 +CONFIG_FIT_VERBOSE=y
 +CONFIG_IMAGE_FORMAT_LEGACY=y
 +CONFIG_SPL_STACK_R=y
 +CONFIG_SPL_OS_BOOT=y
 +CONFIG_SPL_SPI_LOAD=y
 +CONFIG_SYS_PROMPT="Zynq> "
 +CONFIG_CMD_THOR_DOWNLOAD=y
 +CONFIG_CMD_EEPROM=y
 +CONFIG_CMD_MEMTEST=y
 +CONFIG_CMD_DFU=y
 +# CONFIG_CMD_FLASH is not set
 +CONFIG_CMD_FPGA_LOADBP=y
 +CONFIG_CMD_FPGA_LOADFS=y
 +CONFIG_CMD_FPGA_LOADMK=y
 +CONFIG_CMD_FPGA_LOADP=y
 +CONFIG_CMD_GPIO=y
 +CONFIG_CMD_I2C=y
 +CONFIG_CMD_MMC=y
 +CONFIG_CMD_SF=y
 +CONFIG_CMD_USB=y
 +# CONFIG_CMD_SETEXPR is not set
 +CONFIG_CMD_TFTPPUT=y
 +CONFIG_CMD_CACHE=y
 +CONFIG_CMD_EXT4_WRITE=y
 +CONFIG_OF_EMBED=y
 +CONFIG_DEFAULT_DEVICE_TREE="zynq-zc702"
 +CONFIG_ENV_IS_IN_SPI_FLASH=y
 +CONFIG_NET_RANDOM_ETHADDR=y
 +CONFIG_SPL_DM_SEQ_ALIAS=y
 +CONFIG_DFU_MMC=y
 +CONFIG_DFU_RAM=y
 +CONFIG_FPGA_XILINX=y
 +CONFIG_FPGA_ZYNQPL=y
 +CONFIG_DM_GPIO=y
 +CONFIG_SYS_I2C_ZYNQ=y
 +CONFIG_ZYNQ_I2C0=y
 +CONFIG_LED=y
 +CONFIG_LED_GPIO=y
 +CONFIG_MMC_SDHCI=y
 +CONFIG_MMC_SDHCI_ZYNQ=y
 +CONFIG_SPI_FLASH=y
 +CONFIG_SPI_FLASH_BAR=y
 +CONFIG_SF_DUAL_FLASH=y
 +CONFIG_SPI_FLASH_ISSI=y
 +CONFIG_SPI_FLASH_MACRONIX=y
 +CONFIG_SPI_FLASH_SPANSION=y
 +CONFIG_SPI_FLASH_STMICRO=y
 +CONFIG_SPI_FLASH_WINBOND=y
 +CONFIG_PHY_MARVELL=y
 +CONFIG_PHY_REALTEK=y
 +CONFIG_PHY_XILINX=y
 +CONFIG_MII=y
 +CONFIG_ZYNQ_GEM=y
 +CONFIG_DEBUG_UART_ZYNQ=y
 +CONFIG_ZYNQ_SERIAL=y
 +CONFIG_ZYNQ_QSPI=y
 +CONFIG_USB=y
 +CONFIG_USB_EHCI_HCD=y
 +CONFIG_USB_ULPI_VIEWPORT=y
 +CONFIG_USB_ULPI=y
 +CONFIG_USB_GADGET=y
 +CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
 +CONFIG_USB_GADGET_VENDOR_NUM=0x03fd
 +CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
 +CONFIG_CI_UDC=y
 +CONFIG_USB_GADGET_DOWNLOAD=y
 +CONFIG_USB_FUNCTION_THOR=y

diff --cc configs/zynq_zc702_defconfig
Simple merge

diff --cc configs/zynq_zc706_defconfig
Simple merge

diff --cc configs/zynq_zc706_eeprom_defconfig
index 78a3226f67d58db44d8641080b27705b323390df,0000000000000000000000000000000000000000..25dd92fad4baff4aca1e057033010548a58f173f
mode 100644,000000..100644
--- 1/configs/zynq_zc706_eeprom_defconfig
--- /dev/null
+++ b/configs/zynq_zc706_eeprom_defconfig
@@@ -1,87 -1,0 +1,86 @@@
- CONFIG_USB_STORAGE=y
 +CONFIG_ARM=y
 +CONFIG_SYS_CONFIG_NAME="zynq_zc70x"
 +CONFIG_ARCH_ZYNQ=y
 +CONFIG_SYS_TEXT_BASE=0x4000000
 +CONFIG_SYS_MALLOC_F_LEN=0x800
 +CONFIG_ENV_SIZE=0x400
 +CONFIG_SPL=y
 +CONFIG_DEBUG_UART_BASE=0xe0001000
 +CONFIG_DEBUG_UART_CLOCK=50000000
 +CONFIG_IDENT_STRING=" Xilinx Zynq ZC706"
 +CONFIG_SPL_STACK_R_ADDR=0x200000
 +CONFIG_DEBUG_UART=y
 +CONFIG_DISTRO_DEFAULTS=y
 +CONFIG_FIT=y
 +CONFIG_FIT_SIGNATURE=y
 +CONFIG_FIT_VERBOSE=y
 +CONFIG_SPL_FIT_PRINT=y
 +CONFIG_SPL_LOAD_FIT=y
 +CONFIG_IMAGE_FORMAT_LEGACY=y
 +CONFIG_SPL_STACK_R=y
 +CONFIG_SPL_FPGA_SUPPORT=y
 +CONFIG_SPL_OS_BOOT=y
 +CONFIG_SPL_SPI_LOAD=y
 +CONFIG_SYS_PROMPT="Zynq> "
 +CONFIG_CMD_THOR_DOWNLOAD=y
 +CONFIG_CMD_EEPROM=y
 +CONFIG_CMD_DFU=y
 +# CONFIG_CMD_FLASH is not set
 +CONFIG_CMD_FPGA_LOADBP=y
 +CONFIG_CMD_FPGA_LOADFS=y
 +CONFIG_CMD_FPGA_LOADMK=y
 +CONFIG_CMD_FPGA_LOADP=y
 +CONFIG_CMD_GPIO=y
 +CONFIG_CMD_I2C=y
 +CONFIG_CMD_MMC=y
 +CONFIG_CMD_SF=y
 +CONFIG_CMD_USB=y
 +# CONFIG_CMD_SETEXPR is not set
 +CONFIG_CMD_TFTPPUT=y
 +CONFIG_CMD_CACHE=y
 +CONFIG_CMD_EXT4_WRITE=y
 +CONFIG_OF_EMBED=y
 +CONFIG_DEFAULT_DEVICE_TREE="zynq-zc706"
 +CONFIG_ENV_IS_IN_EEPROM=y
 +CONFIG_NET_RANDOM_ETHADDR=y
 +CONFIG_SPL_DM_SEQ_ALIAS=y
 +CONFIG_DFU_MMC=y
 +CONFIG_DFU_RAM=y
 +CONFIG_FPGA_XILINX=y
 +CONFIG_FPGA_ZYNQPL=y
 +CONFIG_DM_GPIO=y
 +CONFIG_SYS_I2C_ZYNQ=y
 +CONFIG_ZYNQ_I2C0=y
 +CONFIG_MMC_SDHCI=y
 +CONFIG_MMC_SDHCI_ZYNQ=y
 +CONFIG_SPI_FLASH=y
 +CONFIG_SPI_FLASH_BAR=y
 +CONFIG_SF_DUAL_FLASH=y
 +CONFIG_SPI_FLASH_ISSI=y
 +CONFIG_SPI_FLASH_MACRONIX=y
 +CONFIG_SPI_FLASH_SPANSION=y
 +CONFIG_SPI_FLASH_STMICRO=y
 +CONFIG_SPI_FLASH_WINBOND=y
 +CONFIG_PHY_MARVELL=y
 +CONFIG_PHY_REALTEK=y
 +CONFIG_PHY_XILINX=y
 +CONFIG_MII=y
 +CONFIG_ZYNQ_GEM=y
 +CONFIG_DEBUG_UART_ZYNQ=y
 +CONFIG_DEBUG_UART_ANNOUNCE=y
 +CONFIG_ZYNQ_SERIAL=y
 +CONFIG_ZYNQ_QSPI=y
 +CONFIG_USB=y
 +CONFIG_USB_EHCI_HCD=y
 +CONFIG_USB_ULPI_VIEWPORT=y
 +CONFIG_USB_ULPI=y
 +CONFIG_USB_GADGET=y
 +CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
 +CONFIG_USB_GADGET_VENDOR_NUM=0x03fd
 +CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
 +CONFIG_CI_UDC=y
 +CONFIG_USB_GADGET_DOWNLOAD=y
 +CONFIG_USB_FUNCTION_THOR=y
 +CONFIG_WDT=y
 +CONFIG_WDT_CDNS=y
 +CONFIG_SPL_GZIP=y

diff --cc configs/zynq_zed_defconfig
Simple merge

diff --cc configs/zynq_zybo_defconfig
Simple merge

diff --cc configs/zynq_zybo_z7_defconfig
Simple merge

diff --cc drivers/mtd/nand/raw/Kconfig
Simple merge

diff --cc drivers/mtd/spi/sf_internal.h
Simple merge

diff --cc drivers/mtd/spi/sf_probe.c
Simple merge

diff --cc drivers/mtd/spi/spi_flash.c
Simple merge

diff --cc drivers/net/phy/phy.c
Simple merge

diff --cc drivers/serial/serial_pl01x.c
Simple merge

diff --cc drivers/usb/dwc3/gadget.c
Simple merge

diff --cc include/spi.h
index 96873cfd857313cf9c8bc0e99a54c8890fccc65c,92427e5f32953f37c67b0369cf6bb3b35cfa521c..2b74930429e3dacd7233d17e9f409d2e7e4bebbc
--- 1/include/spi.h
--- 2/include/spi.h
+++ b/include/spi.h
@@@ -145,16 -115,8 +145,9 @@@ struct spi_slave 
  #define SPI_XFER_ONCE         (SPI_XFER_BEGIN | SPI_XFER_END)
  #define SPI_XFER_MMAP         BIT(2)  /* Memory Mapped start */
  #define SPI_XFER_MMAP_END     BIT(3)  /* Memory Mapped End */
 +#define SPI_XFER_U_PAGE               BIT(4)
  };
  
- /**
-  * Initialization, must be called once on start up.
-  *
-  * TODO: I don't think we really need this.
-  */
- void spi_init(void);
- 
  /**
   * spi_do_alloc_slave - Allocate a new SPI slave (internal)
   *

diff --cc include/spi_flash.h
Simple merge

diff --cc scripts/Makefile.lib
Simple merge