diff options
| author | Tom Rini <trini@ti.com> | 2014-12-08 16:35:06 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-12-08 16:35:06 -0500 |
| commit | 98d2d5e8c473232dc718763dbec284b7349dcc05 (patch) | |
| tree | b4079534ce753b37a8bc772fcdb4527d51505246 /drivers/serial | |
| parent | 8bd60ccf532f0fec07609528c2b04a0725d83984 (diff) | |
| parent | 956a8bae537974673e126f67a227355f27e48ec6 (diff) | |
| download | blackbird-obmc-uboot-98d2d5e8c473232dc718763dbec284b7349dcc05.tar.gz blackbird-obmc-uboot-98d2d5e8c473232dc718763dbec284b7349dcc05.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-ti
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/ns16550.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c index 8f051914f5..af5beba39f 100644 --- a/drivers/serial/ns16550.c +++ b/drivers/serial/ns16550.c @@ -132,11 +132,12 @@ static void NS16550_setbrg(NS16550_t com_port, int baud_divisor) void NS16550_init(NS16550_t com_port, int baud_divisor) { -#if (defined(CONFIG_SPL_BUILD) && defined(CONFIG_OMAP34XX)) +#if (defined(CONFIG_SPL_BUILD) && \ + (defined(CONFIG_OMAP34XX) || defined(CONFIG_OMAP44XX))) /* - * On some OMAP3 devices when UART3 is configured for boot mode before - * SPL starts only THRE bit is set. We have to empty the transmitter - * before initialization starts. + * On some OMAP3/OMAP4 devices when UART3 is configured for boot mode + * before SPL starts only THRE bit is set. We have to empty the + * transmitter before initialization starts. */ if ((serial_in(&com_port->lsr) & (UART_LSR_TEMT | UART_LSR_THRE)) == UART_LSR_THRE) { |
