From: Tom Rini <trini@konsulko.com>
Date: Thu, 24 Dec 2015 14:31:35 +0000 (-0500)
Subject: Merge git://git.denx.de/u-boot-socfpga
X-Git-Tag: KARO-TXSD-2017-03-15~2416
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=40253dd12a64086885097d253b665c9876635e76;p=karo-tx-uboot.git

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

Conflicts:
	include/configs/axs101.h

Signed-off-by: Tom Rini <trini@konsulko.com>
---

40253dd12a64086885097d253b665c9876635e76
diff --cc include/configs/axs101.h
index c92cca274f,ee2a9c0433..98fff63cc1
--- a/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
   */