summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2012-09-13 16:52:38 +0200
committerTom Rini <trini@ti.com>2012-10-15 11:53:55 -0700
commit69ea8070242b977fded9c7967ce3c8c1eeede25f (patch)
tree99f50fe8ecb1d9b47d0f3abca292820c9646c4aa /common
parent28ea4c34a674350daa8d35712a77604aba18abea (diff)
downloadtalos-obmc-uboot-69ea8070242b977fded9c7967ce3c8c1eeede25f.tar.gz
talos-obmc-uboot-69ea8070242b977fded9c7967ce3c8c1eeede25f.zip
serial: oc: Implement CONFIG_SERIAL_MULTI into OpenCores serial driver
Implement support for CONFIG_SERIAL_MULTI into OpenCores serial driver. This driver was so far only usable directly, but this patch also adds support for the multi method. This allows using more than one serial driver alongside the OpenCores driver. Also, add a weak implementation of default_serial_console() returning this driver. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Marek Vasut <marek.vasut@gmail.com> Cc: Tom Rini <trini@ti.com> Cc: Scott McNutt <smcnutt@psyent.com>
Diffstat (limited to 'common')
-rw-r--r--common/serial.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/common/serial.c b/common/serial.c
index a2a55aa164..89f58c408d 100644
--- a/common/serial.c
+++ b/common/serial.c
@@ -76,6 +76,7 @@ serial_initfunc(atmel_serial_initialize);
serial_initfunc(lpc32xx_serial_initialize);
serial_initfunc(mcf_serial_initialize);
serial_initfunc(ns9750_serial_initialize);
+serial_initfunc(oc_serial_initialize);
void serial_register(struct serial_device *dev)
{
@@ -130,6 +131,7 @@ void serial_initialize(void)
lpc32xx_serial_initialize();
mcf_serial_initialize();
ns9750_serial_initialize();
+ oc_serial_initialize();
serial_assign(default_serial_console()->name);
}
OpenPOWER on IntegriCloud