Quick & Dirty fix for log buffer problem when environment is not set

[karo-tx-uboot.git] / common / cmd_log.c

diff --git a/common/cmd_log.c b/common/cmd_log.c
index 2e42f10338582dae089d8acb513d57a3f0b05ad9..1748aa6544e68a6e153756061b9fe8abdbe172b1 100644 (file)
--- a/common/cmd_log.c
+++ b/common/cmd_log.c
@@ -92,7 +92,7 @@ void logbuff_log(char *msg)
 {
        DECLARE_GLOBAL_DATA_PTR;
 
-       if (gd->flags & GD_FLG_RELOC) {
+       if ((gd->flags & GD_FLG_RELOC)&&(getenv ("logstart") != NULL)) {
                logbuff_printk(msg);
        } else {
                puts(msg);
@@ -109,10 +109,10 @@ void logbuff_reset (void)
                ext_tag=(unsigned long *)(log_buf)-3;
                ext_log_start=(unsigned long *)(log_buf)-2;
                ext_logged_chars=(unsigned long *)(log_buf)-1;
-//             if (*ext_tag!=LOGBUFF_MAGIC) {
+/*             if (*ext_tag!=LOGBUFF_MAGIC) {  */
                        logged_chars=log_start=0;
                        *ext_tag=LOGBUFF_MAGIC;
-//             }
+/*             }       */
                log_size=logged_chars;
        }
 }