summaryrefslogtreecommitdiff
path: root/arch/sparc/cpu
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2012-09-14 23:44:09 +0200
committerTom Rini <trini@ti.com>2012-10-15 11:53:58 -0700
commita3827250606895ec2dd4b8d867342b7cabf3692f (patch)
tree6b12200d510d6f07ce49ef3e90642b09142e60f4 /arch/sparc/cpu
parentbffe31c144909722eb8b5878992fdf402cd42f9d (diff)
downloadu-boot-imx-a3827250606895ec2dd4b8d867342b7cabf3692f.zip
u-boot-imx-a3827250606895ec2dd4b8d867342b7cabf3692f.tar.gz
u-boot-imx-a3827250606895ec2dd4b8d867342b7cabf3692f.tar.bz2
serial: Remove CONFIG_SERIAL_MULTI from serial drivers
Remove the support for not-CONFIG_SERIAL_MULTI part from serial port drivers and some board files. Since CONFIG_SERIAL_MULTI is now enabled by default, that part is a dead code. Remove it. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Marek Vasut <marek.vasut@gmail.com> Cc: Anatolij Gustschin <agust@denx.de> Cc: Stefan Roese <sr@denx.de> Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch/sparc/cpu')
-rw-r--r--arch/sparc/cpu/leon2/serial.c32
-rw-r--r--arch/sparc/cpu/leon3/serial.c32
2 files changed, 0 insertions, 64 deletions
diff --git a/arch/sparc/cpu/leon2/serial.c b/arch/sparc/cpu/leon2/serial.c
index 61d059b..16fffb6 100644
--- a/arch/sparc/cpu/leon2/serial.c
+++ b/arch/sparc/cpu/leon2/serial.c
@@ -166,7 +166,6 @@ static void leon2_serial_setbrg(void)
}
}
-#ifdef CONFIG_SERIAL_MULTI
static struct serial_device leon2_serial_drv = {
.name = "leon2_serial",
.start = leon2_serial_init,
@@ -187,34 +186,3 @@ __weak struct serial_device *default_serial_console(void)
{
return &leon2_serial_drv;
}
-#else
-int serial_init(void)
-{
- return leon2_serial_init();
-}
-
-void serial_setbrg(void)
-{
- leon2_serial_setbrg();
-}
-
-void serial_putc(const char c)
-{
- leon2_serial_putc(c);
-}
-
-void serial_puts(const char *s)
-{
- leon2_serial_puts(s);
-}
-
-int serial_getc(void)
-{
- return leon2_serial_getc();
-}
-
-int serial_tstc(void)
-{
- return leon2_serial_tstc();
-}
-#endif
diff --git a/arch/sparc/cpu/leon3/serial.c b/arch/sparc/cpu/leon3/serial.c
index a110244..c4f3ee8 100644
--- a/arch/sparc/cpu/leon3/serial.c
+++ b/arch/sparc/cpu/leon3/serial.c
@@ -140,7 +140,6 @@ static void leon3_serial_setbrg(void)
return;
}
-#ifdef CONFIG_SERIAL_MULTI
static struct serial_device leon3_serial_drv = {
.name = "leon3_serial",
.start = leon3_serial_init,
@@ -161,34 +160,3 @@ __weak struct serial_device *default_serial_console(void)
{
return &leon3_serial_drv;
}
-#else
-int serial_init(void)
-{
- return leon3_serial_init();
-}
-
-void serial_setbrg(void)
-{
- leon3_serial_setbrg();
-}
-
-void serial_putc(const char c)
-{
- leon3_serial_putc(c);
-}
-
-void serial_puts(const char *s)
-{
- leon3_serial_puts(s);
-}
-
-int serial_getc(void)
-{
- return leon3_serial_getc();
-}
-
-int serial_tstc(void)
-{
- return leon3_serial_tstc();
-}
-#endif