From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Wed, 4 Sep 2013 12:06:56 +0000 (+0200)
Subject: Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
X-Git-Tag: v2013.10-rc3~8^2~5
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e62d5fb0da76ef168e90cae9bbbda80349aaf137;p=u-boot

Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
---

e62d5fb0da76ef168e90cae9bbbda80349aaf137
diff --cc include/configs/omap5_uevm.h
index 3c4249bdda,3948709798..0d1c43c2eb
--- a/include/configs/omap5_uevm.h
+++ b/include/configs/omap5_uevm.h
@@@ -42,28 -41,11 +43,30 @@@
  #define CONFIG_SYS_I2C_TCA642X_BUS_NUM 4
  #define CONFIG_SYS_I2C_TCA642X_ADDR 0x22
  
 +/* USB UHH support options */
 +#define CONFIG_CMD_USB
 +#define CONFIG_USB_HOST
 +#define CONFIG_USB_EHCI
 +#define CONFIG_USB_EHCI_OMAP
 +#define CONFIG_USB_STORAGE
 +#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
 +#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 +
 +#define CONFIG_OMAP_EHCI_PHY2_RESET_GPIO 80
 +#define CONFIG_OMAP_EHCI_PHY3_RESET_GPIO 79
 +
 +/* Enabled commands */
 +#define CONFIG_CMD_DHCP		/* DHCP Support			*/
 +#define CONFIG_CMD_NET		/* bootp, tftpboot, rarpboot	*/
 +#define CONFIG_CMD_NFS		/* NFS support			*/
 +
 +/* USB Networking options */
 +#define CONFIG_USB_HOST_ETHER
 +#define CONFIG_USB_ETHER_SMSC95XX
 +
  #define CONSOLEDEV		"ttyO2"
+ 
+ /* Max time to hold reset on this board, see doc/README.omap-reset-time */
  #define CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC	16296
  
 -#include <configs/omap5_common.h>
 -
  #endif /* __CONFIG_OMAP5_EVM_H */
diff --cc spl/Makefile
index 339e5e8971,003558c74a..174d0a7fc4
--- a/spl/Makefile
+++ b/spl/Makefile
@@@ -95,9 -80,9 +95,10 @@@ LIBS-$(CONFIG_SPL_POST_MEM_SUPPORT) += 
  LIBS-$(CONFIG_SPL_NET_SUPPORT) += net/libnet.o
  LIBS-$(CONFIG_SPL_ETH_SUPPORT) += drivers/net/libnet.o
  LIBS-$(CONFIG_SPL_ETH_SUPPORT) += drivers/net/phy/libphy.o
 +LIBS-$(CONFIG_SPL_USBETH_SUPPORT) += drivers/net/phy/libphy.o
  LIBS-$(CONFIG_SPL_MUSB_NEW_SUPPORT) += drivers/usb/musb-new/libusb_musb-new.o
  LIBS-$(CONFIG_SPL_USBETH_SUPPORT) += drivers/usb/gadget/libusb_gadget.o
+ LIBS-$(CONFIG_SPL_WATCHDOG_SUPPORT) += drivers/watchdog/libwatchdog.o
  
  ifneq ($(CONFIG_OMAP_COMMON),)
  LIBS-y += $(CPUDIR)/omap-common/libomap-common.o