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

diff --cc MAINTAINERS
Simple merge

diff --cc boards.cfg
Simple merge

diff --cc drivers/video/Makefile
Simple merge

diff --cc include/configs/omap5_uevm.h
index 3c4249bddae6cba749ceb7e9394611713ad83213,39487097981b81c904f02edcc09262e4af18596c..0d1c43c2eb570dbdce1749c30000f65eaca8e7ac
--- 1/include/configs/omap5_uevm.h
--- 2/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 339e5e897115815162ba999790f168a3a58ea80f,003558c74a91ea5ade6883be84d9db5d7dc87a9a..174d0a7fc47fe60d16b2613a57cd97055dca0970
--- 1/spl/Makefile
--- 2/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