From: Tom Rini Date: Mon, 27 Oct 2014 13:05:43 +0000 (-0400) Subject: Merge branch 'master' of git://git.denx.de/u-boot-ti X-Git-Tag: v2015.01-rc1~125 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5aa7bece1045c28806ce919099616ebe8fa63325;p=u-boot Merge branch 'master' of git://git.denx.de/u-boot-ti --- 5aa7bece1045c28806ce919099616ebe8fa63325 diff --cc board/overo/overo.c index 7506820e34,66146eead5..dfb8602baf --- a/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/usb/host/Makefile index c9d2ed50cf,3d3a0c42a5..1c3592914d --- a/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