summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-01-11 18:17:33 +0100
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-01-11 18:17:33 +0100
commit59ee45ee91cc91b392a8e2684bfcb8c933ce4967 (patch)
tree120150545e45a778e613171cdb75a5d1609e8781 /drivers
parent80e409508b9bba8c372cdd44565a3d472b10e904 (diff)
parent039cbaefcf57338cc9b6a3c656db64e7907838db (diff)
downloadu-boot-imx-59ee45ee91cc91b392a8e2684bfcb8c933ce4967.zip
u-boot-imx-59ee45ee91cc91b392a8e2684bfcb8c933ce4967.tar.gz
u-boot-imx-59ee45ee91cc91b392a8e2684bfcb8c933ce4967.tar.bz2
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'drivers')
-rw-r--r--drivers/serial/ns16550.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index bbd91ca..87a0917 100644
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -36,8 +36,10 @@
void NS16550_init(NS16550_t com_port, int baud_divisor)
{
+#if (!defined(CONFIG_SYS_NS16550_BROKEN_TEMT))
while (!(serial_in(&com_port->lsr) & UART_LSR_TEMT))
;
+#endif
serial_out(CONFIG_SYS_NS16550_IER, &com_port->ier);
#if (defined(CONFIG_OMAP) && !defined(CONFIG_OMAP3_ZOOM2)) || \