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

* 'next' of git://git.denx.de/u-boot-net:
  net: Inline the new eth_setenv_enetaddr_by_index function
  net: allow setting env enetaddr from net device setting
  net/designware: Consecutive writes to the same register to be avoided
  CACHE: net: asix: Fix asix driver to work with data cache on
  net: phy: micrel: make ksz9021 phy accessible
  net: abort network initialization if the PHY driver fails
  phylib: phy_startup() should return an error code on failure
  net: tftp: fix type of block arg to store_block

Signed-off-by: Wolfgang Denk <wd@denx.de>

diff --combined include/configs/mx6qsabrelite.h
index fbd10d670f8c80d1ea1748b37d717807dc88bc56,c66229c8024cc289f31ad85fd9912dd25a6f8c28..e42fe6b00b445e2ea0623fb682cb758fdf09c586
--- 1/include/configs/mx6qsabrelite.h
--- 2/include/configs/mx6qsabrelite.h
+++ b/include/configs/mx6qsabrelite.h
@@@ -58,14 -58,6 +58,14 @@@
  #define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0)
  #endif
  
 +/* I2C Configs */
 +#define CONFIG_CMD_I2C
 +#define CONFIG_HARD_I2C
 +#define CONFIG_I2C_MXC
 +#define CONFIG_SYS_I2C_BASE           I2C3_BASE_ADDR
 +#define CONFIG_SYS_I2C_SPEED            100000
 +#define CONFIG_SYS_I2C_SLAVE            0xfe
 +
  /* MMC Configs */
  #define CONFIG_FSL_ESDHC
  #define CONFIG_FSL_USDHC
@@@ -104,6 -96,7 +104,7 @@@
  #define CONFIG_FEC_MXC_PHYADDR                6
  #define CONFIG_PHYLIB
  #define CONFIG_PHY_MICREL
+ #define CONFIG_PHY_MICREL_KSZ9021
  
  /* USB Configs */
  #define CONFIG_CMD_USB