Merge git://git.denx.de/u-boot

[u-boot] / board / cogent / serial.c

diff --git a/board/cogent/serial.c b/board/cogent/serial.c
index 18a9dbf35cd7cf15fc65f648c8975aacf6b8f4a9..20631d162dd72ea5b623495927d2d31fc01dbfa9 100644 (file)
--- a/board/cogent/serial.c
+++ b/board/cogent/serial.c
@@ -68,12 +68,6 @@ static void cogent_serial_putc(const char c)
        cma_mb_reg_write (&mbsp->ser_thr, c);
 }
 
-static void cogent_serial_puts(const char *s)
-{
-       while (*s != '\0')
-               serial_putc (*s++);
-}
-
 static int cogent_serial_getc(void)
 {
        cma_mb_serial *mbsp = (cma_mb_serial *) CMA_MB_SERIAL_BASE;
@@ -90,14 +84,13 @@ static int cogent_serial_tstc(void)
        return ((cma_mb_reg_read (&mbsp->ser_lsr) & LSR_DR) != 0);
 }
 
-#ifdef CONFIG_SERIAL_MULTI
 static struct serial_device cogent_serial_drv = {
        .name   = "cogent_serial",
        .start  = cogent_serial_init,
        .stop   = NULL,
        .setbrg = cogent_serial_setbrg,
        .putc   = cogent_serial_putc,
-       .puts   = cogent_serial_puts,
+       .puts   = default_serial_puts,
        .getc   = cogent_serial_getc,
        .tstc   = cogent_serial_tstc,
 };
@@ -111,37 +104,6 @@ __weak struct serial_device *default_serial_console(void)
 {
        return &cogent_serial_drv;
 }
-#else
-int serial_init(void)
-{
-       return cogent_serial_init();
-}
-
-void serial_setbrg(void)
-{
-       cogent_serial_setbrg();
-}
-
-void serial_putc(const char c)
-{
-       cogent_serial_putc(c);
-}
-
-void serial_puts(const char *s)
-{
-       cogent_serial_puts(s);
-}
-
-int serial_getc(void)
-{
-       return cogent_serial_getc();
-}
-
-int serial_tstc(void)
-{
-       return cogent_serial_tstc();
-}
-#endif
 #endif /* CONS_NONE */
 
 #if defined(CONFIG_CMD_KGDB) && \