summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2012-09-13 16:48:50 +0200
committerTom Rini <trini@ti.com>2012-10-15 11:53:54 -0700
commit8c085757498281aed461979518401179d3e9942f (patch)
tree5e258888503f5eb81afa7f987bbd0ea8656ae742 /common
parent088a4f3cdfcf5f194768f6fc54c96d01ba128d50 (diff)
downloadtalos-obmc-uboot-8c085757498281aed461979518401179d3e9942f.tar.gz
talos-obmc-uboot-8c085757498281aed461979518401179d3e9942f.zip
serial: arm: Implement CONFIG_SERIAL_MULTI into altera_jtag serial driver
Implement support for CONFIG_SERIAL_MULTI into altera_jtag 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 altera_jtag 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: Thomas Chou <thomas@wytron.com.tw>
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 5129837898..65d9e84eb3 100644
--- a/common/serial.c
+++ b/common/serial.c
@@ -70,6 +70,7 @@ serial_initfunc(evb64260_serial_initialize);
serial_initfunc(ml2_serial_initialize);
serial_initfunc(sconsole_serial_initialize);
serial_initfunc(p3mx_serial_initialize);
+serial_initfunc(altera_jtag_serial_initialize);
void serial_register(struct serial_device *dev)
{
@@ -118,6 +119,7 @@ void serial_initialize(void)
ml2_serial_initialize();
sconsole_serial_initialize();
p3mx_serial_initialize();
+ altera_jtag_serial_initialize();
serial_assign(default_serial_console()->name);
}
OpenPOWER on IntegriCloud