powerpc: Use generic global_data

[u-boot] / arch / powerpc / cpu / mpc8220 / uart.c

diff --git a/arch/powerpc/cpu/mpc8220/uart.c b/arch/powerpc/cpu/mpc8220/uart.c
index 545c81aa4237d1f25607853aac5b3b56528e864e..772528f82c372dcad26a4a11dcae4a6c94ee65da 100644 (file)
--- a/arch/powerpc/cpu/mpc8220/uart.c
+++ b/arch/powerpc/cpu/mpc8220/uart.c
@@ -84,13 +84,6 @@ static void mpc8220_serial_putc(const char c)
        psc->xmitbuf[0] = c;
 }
 
-static void mpc8220_serial_puts(const char *s)
-{
-       while (*s) {
-               serial_putc (*s++);
-       }
-}
-
 static int mpc8220_serial_getc(void)
 {
        volatile psc8220_t *psc = (psc8220_t *) PSC_BASE;
@@ -126,14 +119,13 @@ static void mpc8220_serial_setbrg(void)
        psc->cr = PSC_CR_RX_ENABLE | PSC_CR_TX_ENABLE;
 }
 
-#ifdef CONFIG_SERIAL_MULTI
 static struct serial_device mpc8220_serial_drv = {
        .name   = "mpc8220_serial",
        .start  = mpc8220_serial_init,
        .stop   = NULL,
        .setbrg = mpc8220_serial_setbrg,
        .putc   = mpc8220_serial_putc,
-       .puts   = mpc8220_serial_puts,
+       .puts   = default_serial_puts,
        .getc   = mpc8220_serial_getc,
        .tstc   = mpc8220_serial_tstc,
 };
@@ -147,35 +139,4 @@ __weak struct serial_device *default_serial_console(void)
 {
        return &mpc8220_serial_drv;
 }
-#else
-int serial_init(void)
-{
-       return mpc8220_serial_init();
-}
-
-void serial_setbrg(void)
-{
-       mpc8220_serial_setbrg();
-}
-
-void serial_putc(const char c)
-{
-       mpc8220_serial_putc(c);
-}
-
-void serial_puts(const char *s)
-{
-       mpc8220_serial_puts(s);
-}
-
-int serial_getc(void)
-{
-       return mpc8220_serial_getc();
-}
-
-int serial_tstc(void)
-{
-       return mpc8220_serial_tstc();
-}
-#endif
 #endif /* CONFIG_PSC_CONSOLE */