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

Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
	include/configs/dra7xx_evm.h

diff --combined configs/colibri_vf_defconfig
index 235f004,fc2164c..fce6bac
--- 1/configs/colibri_vf_defconfig
--- 2/configs/colibri_vf_defconfig
+++ b/configs/colibri_vf_defconfig
@@@ -26,8 -26,6 +26,8 @@@ CONFIG_CMD_FS_GENERIC=
  CONFIG_CMD_UBI=y
  CONFIG_OF_CONTROL=y
  CONFIG_DM=y
 +CONFIG_DFU_MMC=y
 +CONFIG_DFU_NAND=y
  CONFIG_DM_GPIO=y
  CONFIG_VYBRID_GPIO=y
  CONFIG_NAND_VF610_NFC=y
@@@ -39,6 -37,7 +39,7 @@@ CONFIG_DM_SPI=
  CONFIG_FSL_DSPI=y
  CONFIG_USB=y
  CONFIG_USB_STORAGE=y
+ CONFIG_DM_USB=y
  CONFIG_USB_GADGET=y
  CONFIG_CI_UDC=y
  CONFIG_USB_GADGET_DOWNLOAD=y

diff --combined drivers/usb/common/fsl-errata.c
index 972016c,f2bffba..0dc3dd8
--- 1/drivers/usb/common/fsl-errata.c
--- 2/drivers/usb/common/fsl-errata.c
+++ b/drivers/usb/common/fsl-errata.c
@@@ -53,8 -53,7 +53,8 @@@ bool has_erratum_a006261(void
        case SVR_P2041:
        case SVR_P2040:
                return IS_SVR_REV(svr, 1, 0) ||
 -                      IS_SVR_REV(svr, 1, 1) || IS_SVR_REV(svr, 2, 1);
 +                      IS_SVR_REV(svr, 1, 1) ||
 +                      IS_SVR_REV(svr, 2, 0) || IS_SVR_REV(svr, 2, 1);
        case SVR_P3041:
                return IS_SVR_REV(svr, 1, 0) ||
                        IS_SVR_REV(svr, 1, 1) ||
@@@ -64,10 -63,16 +64,10 @@@
        case SVR_P5021:
                return IS_SVR_REV(svr, 1, 0) || IS_SVR_REV(svr, 2, 0);
        case SVR_T4240:
 -      case SVR_T4160:
 -      case SVR_T4080:
                return IS_SVR_REV(svr, 1, 0) || IS_SVR_REV(svr, 2, 0);
 -      case SVR_T1040:
 -              return IS_SVR_REV(svr, 1, 0);
 -      case SVR_T2080:
 -      case SVR_T2081:
 -              return IS_SVR_REV(svr, 1, 0);
        case SVR_P5040:
 -              return IS_SVR_REV(svr, 1, 0);
 +              return IS_SVR_REV(svr, 1, 0) ||
 +                      IS_SVR_REV(svr, 2, 0) || IS_SVR_REV(svr, 2, 1);
  #endif
        }
  
@@@ -185,4 -190,30 +185,30 @@@ bool has_erratum_a008751(void
        return false;
  }
  
+ bool has_erratum_a010151(void)
+ {
+       u32 svr = get_svr();
+       u32 soc = SVR_SOC_VER(svr);
+ 
+       switch (soc) {
+ #ifdef CONFIG_ARM64
+       case SVR_LS2080A:
+       case SVR_LS2085A:
+       case SVR_LS1046A:
+       case SVR_LS1012A:
+               return IS_SVR_REV(svr, 1, 0);
+       case SVR_LS1043A:
+               return IS_SVR_REV(svr, 1, 0) || IS_SVR_REV(svr, 1, 1);
+ #endif
+ #ifdef CONFIG_LS102XA
+       case SOC_VER_LS1020:
+       case SOC_VER_LS1021:
+       case SOC_VER_LS1022:
+       case SOC_VER_SLS1020:
+               return IS_SVR_REV(svr, 2, 0);
+ #endif
+       }
+       return false;
+ }
+ 
  #endif

diff --combined include/configs/colibri_imx7.h
index e911303,b628d11..16ae952
--- 1/include/configs/colibri_imx7.h
--- 2/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@@ -44,9 -44,9 +44,9 @@@
  
  #define CONFIG_PHYLIB
  #define CONFIG_PHY_MICREL
- #define CONFIG_TFTP_TSIZE
  #define CONFIG_IP_DEFRAG
- #define CONFIG_TFTP_BLOCKSIZE         16384
+ #define CONFIG_TFTP_BLOCKSIZE         16352
+ #define CONFIG_TFTP_TSIZE
  
  /* ENET1 */
  #define IMX_FEC_BASE                  ENET_IPS_BASE_ADDR
@@@ -220,6 -220,8 +220,6 @@@
  #define CONFIG_USB_FUNCTION_MASS_STORAGE
  
  /* USB Device Firmware Update support */
 -#define CONFIG_USB_FUNCTION_DFU
 -#define CONFIG_DFU_MMC
  #define CONFIG_SYS_DFU_DATA_BUF_SIZE  SZ_16M
  #define DFU_DEFAULT_POLL_TIMEOUT      300
  

diff --combined include/configs/dra7xx_evm.h
index cecb00f,0726875..66ce82c
--- 1/include/configs/dra7xx_evm.h
--- 2/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@@ -132,6 -132,23 +132,23 @@@
  #define CONFIG_FASTBOOT_FLASH_MMC_DEV   1
  #endif
  
+ #ifdef CONFIG_SPL_BUILD
+ #undef CONFIG_CMD_BOOTD
+ #ifdef CONFIG_SPL_DFU_SUPPORT
+ #define CONFIG_SPL_LOAD_FIT_ADDRESS 0x80200000
+ #define CONFIG_SPL_ENV_SUPPORT
+ #define CONFIG_SPL_HASH_SUPPORT
+ #define DFU_ALT_INFO_RAM \
+       "dfu_alt_info_ram=" \
+       "kernel ram 0x80200000 0x4000000;" \
+       "fdt ram 0x80f80000 0x80000;" \
+       "ramdisk ram 0x81000000 0x4000000\0"
+ #define DFUARGS \
+       "dfu_bufsiz=0x10000\0" \
+       DFU_ALT_INFO_RAM
+ #endif
+ #endif
+ 
  #include <configs/ti_omap5_common.h>
  
  /* Enhance our eMMC support / experience. */
@@@ -205,6 -222,15 +222,6 @@@
  #define CONFIG_OMAP_USB_PHY
  #define CONFIG_OMAP_USB2PHY2_HOST
  
 -/* USB Device Firmware Update support */
 -#define CONFIG_USB_FUNCTION_DFU
 -#define CONFIG_DFU_RAM
 -
 -#ifndef CONFIG_SPL_BUILD
 -#define CONFIG_DFU_MMC
 -#define CONFIG_DFU_SF
 -#endif
 -
  /* SATA */
  #define CONFIG_BOARD_LATE_INIT
  #define CONFIG_SCSI