Merging Stelian Pop AT91 patches

[platform/kernel/u-boot.git] / common / cmd_log.c

diff --git a/common/cmd_log.c b/common/cmd_log.c
index 34b36ff..c6e72ac 100644 (file)
--- a/common/cmd_log.c
+++ b/common/cmd_log.c
@@ -76,7 +76,7 @@ void logbuff_init_ptrs (void)
        lbuf = (char *)CONFIG_ALT_LB_ADDR;
 #else
        log = (logbuff_t *)(gd->bd->bi_memsize-LOGBUFF_LEN) - 1;
-       lbuf = log->buf;
+       lbuf = (char *)log->buf;
 #endif
 
        /* Set up log version */
@@ -107,7 +107,7 @@ void logbuff_init_ptrs (void)
        if ((s = getenv ("loglevel")) != NULL)
                console_loglevel = (int)simple_strtoul (s, NULL, 10);
 
-       gd->post_log_word |= LOGBUFF_INITIALIZED;
+       gd->flags |= GD_FLG_LOGINIT;
 }
 
 void logbuff_reset (void)
@@ -168,7 +168,7 @@ static void logbuff_puts (const char *s)
 
 void logbuff_log(char *msg)
 {
-       if ((gd->post_log_word & LOGBUFF_INITIALIZED)) {
+       if ((gd->flags & GD_FLG_LOGINIT)) {
                logbuff_printk (msg);
        } else {
                /* Can happen only for pre-relocated errors as logging */