Merge with /home/wd/git/u-boot/master

[u-boot] / common / cmd_log.c

diff --git a/common/cmd_log.c b/common/cmd_log.c
index ace2d522c25739c8fb5cd45c616e8f662bccb101..57ef48461a537b12228ab830fe27db794d8c51c7 100644 (file)
--- a/common/cmd_log.c
+++ b/common/cmd_log.c
@@ -75,6 +75,7 @@ void logbuff_init_ptrs (void)
 {
        DECLARE_GLOBAL_DATA_PTR;
        unsigned long *ext_tag;
+       unsigned long post_word;
        char *s;
 
        log_buf = (unsigned char *)(gd->bd->bi_memsize-LOGBUFF_LEN);
@@ -82,15 +83,16 @@ void logbuff_init_ptrs (void)
        ext_log_start = (unsigned long *)(log_buf)-3;
        ext_log_size = (unsigned long *)(log_buf)-2;
        ext_logged_chars = (unsigned long *)(log_buf)-1;
+       post_word = post_word_load();
 #ifdef CONFIG_POST
        /* The post routines have setup the word so we can simply test it */
-       if ((post_word_load () & 0xffff) == POST_POWERON) {
+       if (post_word_load () & POST_COLDBOOT) {
                logged_chars = log_size = log_start = 0;
                *ext_tag = LOGBUFF_MAGIC;
        }
 #else
        /* No post routines, so we do our own checking                    */
-       if (post_word_load () != LOGBUFF_MAGIC) {
+       if (post_word != LOGBUFF_MAGIC) {
                logged_chars = log_size = log_start = 0;
                post_word_store (LOGBUFF_MAGIC);
                *ext_tag = LOGBUFF_MAGIC;