diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_log.c | 6 | ||||
| -rw-r--r-- | common/cmd_nvedit.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/common/cmd_log.c b/common/cmd_log.c index 2e42f10..1748aa6 100644 --- 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; } } diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index 08e888c..0a19ce4 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -42,6 +42,7 @@ #include <common.h> #include <command.h> #include <environment.h> +#include <watchdog.h> #include <cmd_nvedit.h> #include <linux/stddef.h> #include <asm/byteorder.h> @@ -459,6 +460,8 @@ char *getenv (uchar *name) { int i, nxt; + WATCHDOG_RESET(); + for (i=0; env_get_char(i) != '\0'; i=nxt+1) { int val; |