diff options
author | Kim Phillips <kim.phillips@freescale.com> | 2009-02-19 11:06:58 -0600 |
---|---|---|
committer | Kim Phillips <kim.phillips@freescale.com> | 2009-02-19 11:06:58 -0600 |
commit | 7511835b29f2074ebfa8ea794f0303ec8e49542b (patch) | |
tree | 0a0f8539a467c897ea0f33ec0b17b8b664e7c7e3 /drivers/serial/ns16550.c | |
parent | 2b68b23373f96199a0cafbfd7a9f79ed62381ebb (diff) | |
parent | 32482be67775e00b4cbc49fba62347c1ecc6229c (diff) | |
download | u-boot-imx-7511835b29f2074ebfa8ea794f0303ec8e49542b.zip u-boot-imx-7511835b29f2074ebfa8ea794f0303ec8e49542b.tar.gz u-boot-imx-7511835b29f2074ebfa8ea794f0303ec8e49542b.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'drivers/serial/ns16550.c')
-rw-r--r-- | drivers/serial/ns16550.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c index 93c2243..1b347e9 100644 --- a/drivers/serial/ns16550.c +++ b/drivers/serial/ns16550.c @@ -39,6 +39,7 @@ void NS16550_init (NS16550_t com_port, int baud_divisor) #endif } +#ifndef CONFIG_NS16550_MIN_FUNCTIONS void NS16550_reinit (NS16550_t com_port, int baud_divisor) { com_port->ier = 0x00; @@ -53,6 +54,7 @@ void NS16550_reinit (NS16550_t com_port, int baud_divisor) com_port->dlm = (baud_divisor >> 8) & 0xff; com_port->lcr = LCRVAL; } +#endif /* CONFIG_NS16550_MIN_FUNCTIONS */ void NS16550_putc (NS16550_t com_port, char c) { @@ -60,6 +62,7 @@ void NS16550_putc (NS16550_t com_port, char c) com_port->thr = c; } +#ifndef CONFIG_NS16550_MIN_FUNCTIONS char NS16550_getc (NS16550_t com_port) { while ((com_port->lsr & LSR_DR) == 0) { @@ -76,4 +79,5 @@ int NS16550_tstc (NS16550_t com_port) return ((com_port->lsr & LSR_DR) != 0); } +#endif /* CONFIG_NS16550_MIN_FUNCTIONS */ #endif |