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

diff --combined README
index da74513a34ae590422ebb4fc35231ca4b2de9a53,c0a9ea0ed8b6be651dc8b97439fab713b8ca3522..ef8d437fbd46bf350eb6b259eeed3dd0a1810276
--- 1/README
--- 2/README
+++ b/README
@@@ -1472,8 -1472,8 +1472,8 @@@ The following options need to be config
                CONFIG_TPM
                Support TPM devices.
  
 -              CONFIG_TPM_TIS_I2C
 -              Support for i2c bus TPM devices. Only one device
 +              CONFIG_TPM_TIS_INFINEON
 +              Support for Infineon i2c bus TPM devices. Only one device
                per system is supported at this time.
  
                        CONFIG_TPM_TIS_I2C_BURST_LIMITATION
@@@ -3494,10 -3494,6 +3494,10 @@@ FIT uImage format
                without a fastmap.
                default: 0
  
 +              CONFIG_MTD_UBI_FM_DEBUG
 +              Enable UBI fastmap debug
 +              default: 0
 +
  - UBIFS support
                CONFIG_CMD_UBIFS
  
@@@ -5454,10 -5450,10 +5454,10 @@@ List of environment variables (most lik
                  unset, then it will be made silent if the U-Boot console
                  is silent.
  
-   tftpsrcport - If this is set, the value is used for TFTP's
+   tftpsrcp    - If this is set, the value is used for TFTP's
                  UDP source port.
  
-   tftpdstport - If this is set, the value is used for TFTP's UDP
+   tftpdstp    - If this is set, the value is used for TFTP's UDP
                  destination port instead of the Well Know Port 69.
  
    tftpblocksize - Block size to use for TFTP transfers; if not set,
@@@ -5471,6 -5467,14 +5471,14 @@@
                  faster in networks with high packet loss rates or
                  with unreliable TFTP servers.
  
+   tftptimeoutcountmax - maximum count of TFTP timeouts (no
+                 unit, minimum value = 0). Defines how many timeouts
+                 can happen during a single file transfer before that
+                 transfer is aborted. The default is 10, and 0 means
+                 'no timeouts allowed'. Increasing this value may help
+                 downloads succeed with high packet loss rates, or with
+                 unreliable TFTP servers or client hardware.
+ 
    vlan                - When set to a value < 4095 the traffic over
                  Ethernet is encapsulated/received over 802.1q
                  VLAN tagged frames.

diff --combined drivers/usb/eth/smsc95xx.c
index d4b5ff465a763c7561fa3ea6bd42ea67678cb131,e6943641225c12d739ab5a3d5851ee374652e4ce..202e48285f9c590b422d85ae7850b1c50528fa1f
--- 1/drivers/usb/eth/smsc95xx.c
--- 2/drivers/usb/eth/smsc95xx.c
+++ b/drivers/usb/eth/smsc95xx.c
@@@ -120,8 -120,9 +120,9 @@@
  /* Some extra defines */
  #define HS_USB_PKT_SIZE                       512
  #define FS_USB_PKT_SIZE                       64
- #define DEFAULT_HS_BURST_CAP_SIZE     (16 * 1024 + 5 * HS_USB_PKT_SIZE)
- #define DEFAULT_FS_BURST_CAP_SIZE     (6 * 1024 + 33 * FS_USB_PKT_SIZE)
+ /* 5/33 is lower limit for BURST_CAP to work */
+ #define DEFAULT_HS_BURST_CAP_SIZE     (5 * HS_USB_PKT_SIZE)
+ #define DEFAULT_FS_BURST_CAP_SIZE     (33 * FS_USB_PKT_SIZE)
  #define DEFAULT_BULK_IN_DELAY         0x00002000
  #define MAX_SINGLE_PACKET_SIZE                2048
  #define EEPROM_MAC_OFFSET             0x01
@@@ -135,7 -136,7 +136,7 @@@
  #define USB_BULK_SEND_TIMEOUT 5000
  #define USB_BULK_RECV_TIMEOUT 5000
  
- #define RX_URB_SIZE 2048
+ #define RX_URB_SIZE DEFAULT_HS_BURST_CAP_SIZE
  #define PHY_CONNECT_TIMEOUT 5000
  
  #define TURBO_MODE
@@@ -529,22 -530,6 +530,6 @@@ static int smsc95xx_init_common(struct 
        if (ret < 0)
                return ret;
  
-       ret = smsc95xx_read_reg(udev, HW_CFG, &read_buf);
-       if (ret < 0)
-               return ret;
-       debug("Read Value from HW_CFG : 0x%08x\n", read_buf);
- 
-       read_buf |= HW_CFG_BIR_;
-       ret = smsc95xx_write_reg(udev, HW_CFG, read_buf);
-       if (ret < 0)
-               return ret;
- 
-       ret = smsc95xx_read_reg(udev, HW_CFG, &read_buf);
-       if (ret < 0)
-               return ret;
-       debug("Read Value from HW_CFG after writing "
-               "HW_CFG_BIR_: 0x%08x\n", read_buf);
- 
  #ifdef TURBO_MODE
        if (dev->pusb_dev->speed == USB_SPEED_HIGH) {
                burst_cap = DEFAULT_HS_BURST_CAP_SIZE / HS_USB_PKT_SIZE;
@@@ -945,7 -930,7 +930,7 @@@ int smsc95xx_eth_get_info(struct usb_de
  #ifdef CONFIG_DM_ETH
  static int smsc95xx_eth_start(struct udevice *dev)
  {
 -      struct usb_device *udev = dev_get_parentdata(dev);
 +      struct usb_device *udev = dev_get_parent_priv(dev);
        struct smsc95xx_private *priv = dev_get_priv(dev);
        struct eth_pdata *pdata = dev_get_platdata(dev);
  
@@@ -1029,7 -1014,7 +1014,7 @@@ static int smsc95xx_free_pkt(struct ude
  
  int smsc95xx_write_hwaddr(struct udevice *dev)
  {
 -      struct usb_device *udev = dev_get_parentdata(dev);
 +      struct usb_device *udev = dev_get_parent_priv(dev);
        struct eth_pdata *pdata = dev_get_platdata(dev);
        struct smsc95xx_private *priv = dev_get_priv(dev);