Merge branch 'master' of git://git.denx.de/u-boot-i2c

[oweals/u-boot.git] / board / pcippc2 / sconsole.c

diff --git a/board/pcippc2/sconsole.c b/board/pcippc2/sconsole.c
index a9f2b298116a8d68f9fbda2ac6f85e0c427d10de..6ef38f437bfaecf9b5b40ec1a4fe7abf08967664 100644 (file)
--- a/board/pcippc2/sconsole.c
+++ b/board/pcippc2/sconsole.c
@@ -26,6 +26,8 @@
 
 #include "sconsole.h"
 
+DECLARE_GLOBAL_DATA_PTR;
+
 void   (*sconsole_putc) (char) = 0;
 void   (*sconsole_puts) (const char *) = 0;
 int    (*sconsole_getc) (void) = 0;
@@ -34,14 +36,12 @@ void        (*sconsole_setbrg) (void) = 0;
 
 int serial_init (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        sconsole_buffer_t *sb = SCONSOLE_BUFFER;
 
        sb->pos  = 0;
        sb->size = 0;
        sb->baud = gd->baudrate;
-       sb->max_size = CFG_SCONSOLE_SIZE - sizeof (sconsole_buffer_t);
+       sb->max_size = CONFIG_SYS_SCONSOLE_SIZE - sizeof (sconsole_buffer_t);
 
        return (0);
 }
@@ -104,8 +104,6 @@ int serial_tstc (void)
 
 void serial_setbrg (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        if (sconsole_setbrg) {
                (*sconsole_setbrg) ();
        } else {