From: Marek Vasut <marex@denx.de>
Date: Sat, 15 Sep 2012 08:25:19 +0000 (+0200)
Subject: serial: ns16550: Call usbtty_poll only in non-SPL build
X-Git-Tag: v2013.01-rc1~285
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f2041388bd17a771f04030c39ec8b21caa2588dd;p=u-boot

serial: ns16550: Call usbtty_poll only in non-SPL build

Having both USBTTY and CONFIG_SERIAL_MULTI enabled in SPL, the
usbtty.c file is protected in Makefile to not be compiled into
the SPL. Yet, the ns16550 serial driver does not contain such
protection. Add it to avoid missing symbol error.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Tom Rini <trini@ti.com>
---

diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index facadd2f5c..9027781445 100644
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -101,7 +101,7 @@ void NS16550_putc(NS16550_t com_port, char c)
 char NS16550_getc(NS16550_t com_port)
 {
 	while ((serial_in(&com_port->lsr) & UART_LSR_DR) == 0) {
-#ifdef CONFIG_USB_TTY
+#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_USB_TTY)
 		extern void usbtty_poll(void);
 		usbtty_poll();
 #endif