1 files changed, 60 insertions, 6 deletions

diff --git a/board/amirix/ap1000/serial.c b/board/amirix/ap1000/serial.c
index 87003be9c12..2c2e9f9d769 100644
--- a/board/amirix/ap1000/serial.c
+++ b/board/amirix/ap1000/serial.c
@@ -24,6 +24,8 @@
 #include <asm/processor.h>
 #include <command.h>
 #include <config.h>
+#include <serial.h>
+#include <linux/compiler.h>
 
 #include <ns16550.h>
 
@@ -36,7 +38,7 @@ const NS16550_t COM_PORTS[] =
 #define CONFIG_SYS_DUART_CHAN gComPort
 static int gComPort = 0;
 
-int serial_init (void)
+static int amirix_serial_init(void)
 {
 	int clock_divisor = CONFIG_SYS_NS16550_CLK / 16 / gd->baudrate;
 
@@ -46,7 +48,7 @@ int serial_init (void)
 	return 0;
 }
 
-void serial_putc (const char c)
+static void amirix_serial_putc(const char c)
 {
 	if (c == '\n') {
 		NS16550_putc (COM_PORTS[CONFIG_SYS_DUART_CHAN], '\r');
@@ -55,17 +57,17 @@ void serial_putc (const char c)
 	NS16550_putc (COM_PORTS[CONFIG_SYS_DUART_CHAN], c);
 }
 
-int serial_getc (void)
+static int amirix_serial_getc(void)
 {
 	return NS16550_getc (COM_PORTS[CONFIG_SYS_DUART_CHAN]);
 }
 
-int serial_tstc (void)
+static int amirix_serial_tstc(void)
 {
 	return NS16550_tstc (COM_PORTS[CONFIG_SYS_DUART_CHAN]);
 }
 
-void serial_setbrg (void)
+static void amirix_serial_setbrg(void)
 {
 	int clock_divisor = CONFIG_SYS_NS16550_CLK / 16 / gd->baudrate;
 
@@ -77,13 +79,65 @@ void serial_setbrg (void)
 #endif
 }
 
-void serial_puts (const char *s)
+static void amirix_serial_puts(const char *s)
 {
 	while (*s) {
 		serial_putc (*s++);
 	}
 }
 
+#ifdef CONFIG_SERIAL_MULTI
+static struct serial_device amirix_serial_drv = {
+	.name	= "amirix_serial",
+	.start	= amirix_serial_init,
+	.stop	= NULL,
+	.setbrg	= amirix_serial_setbrg,
+	.putc	= amirix_serial_putc,
+	.puts	= amirix_serial_puts,
+	.getc	= amirix_serial_getc,
+	.tstc	= amirix_serial_tstc,
+};
+
+void amirix_serial_initialize(void)
+{
+	serial_register(&amirix_serial_drv);
+}
+
+__weak struct serial_device *default_serial_console(void)
+{
+	return &amirix_serial_drv;
+}
+#else
+int serial_init(void)
+{
+	return amirix_serial_init();
+}
+
+void serial_setbrg(void)
+{
+	amirix_serial_setbrg();
+}
+
+void serial_putc(const char c)
+{
+	amirix_serial_putc(c);
+}
+
+void serial_puts(const char *s)
+{
+	amirix_serial_puts(s);
+}
+
+int serial_getc(void)
+{
+	return amirix_serial_getc();
+}
+
+int serial_tstc(void)
+{
+	return amirix_serial_tstc();
+}
+#endif
 #if defined(CONFIG_CMD_KGDB)
 void kgdb_serial_init (void)
 {