Merge branch 'u-boot-arm/next' into 'u-boot-arm/master'

[platform/kernel/u-boot.git] / board / evb64260 / serial.c

diff --git a/board/evb64260/serial.c b/board/evb64260/serial.c
index cf46a4d..83a4217 100644 (file)
--- a/board/evb64260/serial.c
+++ b/board/evb64260/serial.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2001
  * Josh Huber <huber@mclx.com>, Mission Critical Linux, Inc.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -37,8 +21,6 @@
 #include <ns16550.h>
 #endif
 
-#include "serial.h"
-
 #include "mpsc.h"
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -139,21 +121,13 @@ static void evb64260_serial_setbrg(void)
 
 #endif /* CONFIG_MPSC */
 
-static void evb64260_serial_puts(const char *s)
-{
-       while (*s) {
-               serial_putc (*s++);
-       }
-}
-
-#ifdef CONFIG_SERIAL_MULTI
 static struct serial_device evb64260_serial_drv = {
        .name   = "evb64260_serial",
        .start  = evb64260_serial_init,
        .stop   = NULL,
        .setbrg = evb64260_serial_setbrg,
        .putc   = evb64260_serial_putc,
-       .puts   = evb64260_serial_puts,
+       .puts   = default_serial_puts,
        .getc   = evb64260_serial_getc,
        .tstc   = evb64260_serial_tstc,
 };
@@ -167,37 +141,7 @@ __weak struct serial_device *default_serial_console(void)
 {
        return &evb64260_serial_drv;
 }
-#else
-int serial_init(void)
-{
-       return evb64260_serial_init();
-}
-
-void serial_setbrg(void)
-{
-       evb64260_serial_setbrg();
-}
 
-void serial_putc(const char c)
-{
-       evb64260_serial_putc(c);
-}
-
-void serial_puts(const char *s)
-{
-       evb64260_serial_puts(s);
-}
-
-int serial_getc(void)
-{
-       return evb64260_serial_getc();
-}
-
-int serial_tstc(void)
-{
-       return evb64260_serial_tstc();
-}
-#endif
 #if defined(CONFIG_CMD_KGDB)
 void
 kgdb_serial_init(void)