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

Trigger watchdog when reading the env - this might take a while.

Set debugging baud rate for KUP4K board

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;
        }
 }

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index 08e888c08e351ee9f3657b946b1b4cc25a27c1f8..0a19ce405b76f4b12a852a07fb1bb8d02dcee4b1 100644 (file)
--- 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;
 

diff --git a/include/configs/KUP4K.h b/include/configs/KUP4K.h
index 3d9898bb04f04ca2ed4d5b3d34456c8dab2bd6e1..7c512ccd66ccdfc92a592827c6d478150230db9d 100644 (file)
--- a/include/configs/KUP4K.h
+++ b/include/configs/KUP4K.h
@@ -41,7 +41,7 @@
 #define        CONFIG_8xx_CONS_SMC1    1       /* Console is on SMC1           */
 #undef CONFIG_8xx_CONS_SMC2
 #undef CONFIG_8xx_CONS_NONE
-#define CONFIG_BAUDRATE                115200  /* console baudrate = 115kbps   */
+#define CONFIG_BAUDRATE                9600    /* console baudrate             */
 #if 0
 #define CONFIG_BOOTDELAY       -1      /* autoboot disabled            */
 #else