summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2012-09-15 10:25:19 +0200
committerTom Rini <trini@ti.com>2012-10-15 11:53:58 -0700
commitf2041388bd17a771f04030c39ec8b21caa2588dd (patch)
tree20392f162682d70a5ceab036508902dccb86e47e
parentf1f1e9cb7337e9ee6a7d6aeb1f76eb67f4dd126c (diff)
downloadu-boot-imx-f2041388bd17a771f04030c39ec8b21caa2588dd.zip
u-boot-imx-f2041388bd17a771f04030c39ec8b21caa2588dd.tar.gz
u-boot-imx-f2041388bd17a771f04030c39ec8b21caa2588dd.tar.bz2
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>
-rw-r--r--drivers/serial/ns16550.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index facadd2..9027781 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