diff options
| author | Peter Pearse <peter.pearse@arm.com> | 2007-09-07 13:26:51 +0100 |
|---|---|---|
| committer | Peter Pearse <peter.pearse@arm.com> | 2007-09-07 13:26:51 +0100 |
| commit | 470ffef72cf565c4db59352c23bd06cbfb763128 (patch) | |
| tree | 8f175868f568e7f535436407f72f56198928ea7e /common/serial.c | |
| parent | 80767a6cead9990d9e77e62be947843c2c72f469 (diff) | |
| parent | a89cbbd27a60e6740772000fd0688ffba1c2576a (diff) | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'common/serial.c')
| -rw-r--r-- | common/serial.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/common/serial.c b/common/serial.c index 13e9f30e414..dee1cc0ab9c 100644 --- a/common/serial.c +++ b/common/serial.c @@ -32,7 +32,7 @@ DECLARE_GLOBAL_DATA_PTR; static struct serial_device *serial_devices = NULL; static struct serial_device *serial_current = NULL; -#ifndef CONFIG_LWMON +#if !defined(CONFIG_LWMON) && !defined(CONFIG_PXA27X) struct serial_device *default_serial_console (void) { #if defined(CONFIG_8xx_CONS_SMC1) || defined(CONFIG_8xx_CONS_SMC2) @@ -65,7 +65,7 @@ struct serial_device *default_serial_console (void) } #endif -static int serial_register (struct serial_device *dev) +int serial_register (struct serial_device *dev) { dev->init += gd->reloc_off; dev->setbrg += gd->reloc_off; @@ -110,6 +110,15 @@ void serial_initialize (void) serial_register(&eserial4_device); #endif #endif /* CFG_NS16550_SERIAL */ +#if defined (CONFIG_FFUART) + serial_register(&serial_ffuart_device); +#endif +#if defined (CONFIG_BTUART) + serial_register(&serial_btuart_device); +#endif +#if defined (CONFIG_STUART) + serial_register(&serial_stuart_device); +#endif serial_assign (default_serial_console ()->name); } |