summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2012-09-13 12:26:39 +0200
committerTom Rini <trini@ti.com>2012-10-15 11:53:52 -0700
commitafe4c389fb4ca9c8d8f5d37a5f647763ed318e0e (patch)
tree64a27ba972c55efad6dec4a4dea098770574e1f0 /common
parent29b5ff7f8e392cafc91476342a7ee5bd683ee0ec (diff)
downloadu-boot-imx-afe4c389fb4ca9c8d8f5d37a5f647763ed318e0e.zip
u-boot-imx-afe4c389fb4ca9c8d8f5d37a5f647763ed318e0e.tar.gz
u-boot-imx-afe4c389fb4ca9c8d8f5d37a5f647763ed318e0e.tar.bz2
serial: powerpc: Implement CONFIG_SERIAL_MULTI into marvell serial driver
Implement support for CONFIG_SERIAL_MULTI into marvell 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 marvell 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 14a5628..f587d7d 100644
--- a/common/serial.c
+++ b/common/serial.c
@@ -61,6 +61,7 @@ serial_initfunc(mpc85xx_serial_initialize);
serial_initfunc(iop480_serial_initialize);
serial_initfunc(leon2_serial_initialize);
serial_initfunc(leon3_serial_initialize);
+serial_initfunc(marvell_serial_initialize);
void serial_register(struct serial_device *dev)
{
@@ -100,6 +101,7 @@ void serial_initialize(void)
iop480_serial_initialize();
leon2_serial_initialize();
leon3_serial_initialize();
+ marvell_serial_initialize();
serial_assign(default_serial_console()->name);
}