Merge git://git.denx.de/u-boot-socfpga

Conflicts:
	include/configs/axs101.h

Signed-off-by: Tom Rini <[email protected]>

diff --cc include/configs/axs101.h
index c92cca274fcee97095ad86037c0233d13e8a0cb3,ee2a9c04336490b9a3664842a9146d1fd5bfa2b4..98fff63cc12acab597c31d0d611d83a8f2fc03fd
--- 1/include/configs/axs101.h
--- 2/include/configs/axs101.h
+++ b/include/configs/axs101.h
@@@ -98,18 -98,6 +98,12 @@@
  #define CONFIG_MII
  #define CONFIG_PHY_GIGE
  
- /*
-  * Ethernet configuration
-  */
- #define CONFIG_DW_AUTONEG
- 
 +/*
 + * USB 1.1 configuration
 + */
 +#define CONFIG_USB_OHCI_NEW
 +#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1
 +
  /*
   * Commands still not supported in Kconfig
   */

diff --cc include/configs/sunxi-common.h
Simple merge