Merge branch 'master' of git://git.denx.de/u-boot-ti

diff --cc board/overo/overo.c
index 7506820e349f4174679a9d58ee293831c4cc6da2,66146eead5f751650366e14f900a015a6c75c282..dfb8602bafccb8d8c912c58c7d946c06effee2c0
--- 1/board/overo/overo.c
--- 2/board/overo/overo.c
+++ b/board/overo/overo.c
@@@ -58,34 -63,8 +65,19 @@@ static struct 
        char fab_revision[8];
        char env_var[16];
        char env_setting[64];
- } expansion_config;
- 
- #if defined(CONFIG_CMD_NET)
- static void setup_net_chip(void);
- #endif
- 
- /* GPMC definitions for LAN9221 chips on Tobi expansion boards */
- static const u32 gpmc_lan_config[] = {
-     NET_LAN9221_GPMC_CONFIG1,
-     NET_LAN9221_GPMC_CONFIG2,
-     NET_LAN9221_GPMC_CONFIG3,
-     NET_LAN9221_GPMC_CONFIG4,
-     NET_LAN9221_GPMC_CONFIG5,
-     NET_LAN9221_GPMC_CONFIG6,
-     /*CONFIG7- computed as params */
- };
+ } expansion_config = {0x0};
  
 +static const struct ns16550_platdata overo_serial = {
 +      OMAP34XX_UART3,
 +      2,
 +      V_NS16550_CLK
 +};
 +
 +U_BOOT_DEVICE(overo_uart) = {
 +      "serial_omap",
 +      &overo_serial
 +};
 +
  /*
   * Routine: board_init
   * Description: Early hardware init.

diff --cc drivers/net/phy/phy.c
Simple merge

diff --cc drivers/usb/host/Makefile
index c9d2ed50cf498aa8119eec86b353af31fb8823ed,3d3a0c42a5c3c5f26d16fff70f03f30433a21745..1c3592914dcf363c71de68f05a69cf5b21b5d845
--- 1/drivers/usb/host/Makefile
--- 2/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
@@@ -43,8 -43,6 +43,9 @@@ obj-$(CONFIG_USB_EHCI_ZYNQ) += ehci-zyn
  
  # xhci
  obj-$(CONFIG_USB_XHCI) += xhci.o xhci-mem.o xhci-ring.o
+ obj-$(CONFIG_USB_XHCI_KEYSTONE) += xhci-keystone.o
  obj-$(CONFIG_USB_XHCI_EXYNOS) += xhci-exynos5.o
  obj-$(CONFIG_USB_XHCI_OMAP) += xhci-omap.o
 +
 +# designware
 +obj-$(CONFIG_USB_DWC2) += dwc2.o

diff --cc include/configs/ks2_evm.h
Simple merge