summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2012-09-13 12:34:49 +0200
committerTom Rini <trini@ti.com>2012-10-15 11:53:53 -0700
commit26d8eaaa48a9fda94a1bbbf02610dcec5eb8bf9f (patch)
tree5af9ea0026921157bc6d1a2227fd9a7f1d38f088 /common
parentd126f2850fb6dc3d828332c9fceb408128871fa3 (diff)
downloadtalos-obmc-uboot-26d8eaaa48a9fda94a1bbbf02610dcec5eb8bf9f.tar.gz
talos-obmc-uboot-26d8eaaa48a9fda94a1bbbf02610dcec5eb8bf9f.zip
serial: powerpc: Implement CONFIG_SERIAL_MULTI into sconsole serial driver
Implement support for CONFIG_SERIAL_MULTI into sconsole 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 sconsole 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: Anatolij Gustschin <agust@denx.de> Cc: Stefan Roese <sr@denx.de>
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 5673ccd2ef..e4b566e285 100644
--- a/common/serial.c
+++ b/common/serial.c
@@ -68,6 +68,7 @@ serial_initfunc(cogent_serial_initialize);
serial_initfunc(cpci750_serial_initialize);
serial_initfunc(evb64260_serial_initialize);
serial_initfunc(ml2_serial_initialize);
+serial_initfunc(sconsole_serial_initialize);
void serial_register(struct serial_device *dev)
{
@@ -114,6 +115,7 @@ void serial_initialize(void)
cpci750_serial_initialize();
evb64260_serial_initialize();
ml2_serial_initialize();
+ sconsole_serial_initialize();
serial_assign(default_serial_console()->name);
}
OpenPOWER on IntegriCloud