Fix bug in command repeat code (thanks to

Mads Dydensborg and Dave Ellis)

diff --git a/CHANGELOG b/CHANGELOG
index a66d33966c45c2af39b855a4ef9c31118456651c..777a98cf599f66f6794a85d2beea5a119a594ba7 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -67,6 +67,11 @@ Modifications for 0.8.3:
 
 * Added support for ESTEEM192E board (Conn Clark)
 
+* Fixed bug in command repeat code
+
+* Fixed mkimage bug that caused bad headers when image was on NFS
+  mounted filesystem
+
 * New FPGA-Image for CPCI405 and AR405
 
 * PPC405GP PCI Handling reworked to support PCI host and adapter boards.

diff --git a/common/cmd_mem.c b/common/cmd_mem.c
index e34f74535a615a5dd07db595fae6aaba25d85ce2..c7dc30ebe15c732c1044f895aebbaef8c89145d8 100644 (file)
--- a/common/cmd_mem.c
+++ b/common/cmd_mem.c
@@ -33,7 +33,7 @@
 
 #if (CONFIG_COMMANDS & CFG_CMD_MEMORY)
 
-static void mod_mem(int incrflag, int flag, int argc, char *argv[]);
+static void mod_mem(cmd_tbl_t *, int, int, int, char *[]);
 
 /* Display values from last command.
  * Memory modify remembered values are different from display memory.
@@ -139,13 +139,13 @@ void do_mem_md    (cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
 
 void do_mem_mm    (cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
 {
-       mod_mem (1, flag, argc, argv);
+       mod_mem (1, cmdtp, flag, argc, argv);
 }
 
 
 void do_mem_nm    (cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
 {
-       mod_mem (0, flag, argc, argv);
+       mod_mem (0, cmdtp, flag, argc, argv);
 }
 
 
@@ -468,12 +468,17 @@ void do_mem_mtest (cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
  */
 
 static void
-mod_mem(int incrflag, int flag, int argc, char *argv[])
+mod_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char *argv[])
 {
        ulong   addr, size, i;
        int     nbytes;
        extern char console_buffer[];
 
+       if (argc != 2) {
+               printf ("Usage:\n%s\n", cmdtp->usage);
+               return;
+       }
+
 #ifdef CONFIG_BOOT_RETRY_TIME
        reset_cmd_timeout();    /* got a good command to get here */
 #endif

diff --git a/common/main.c b/common/main.c
index 98fb0991e86760e441bd66143c66274a233d4ea1..0b172571fb6487c260a1cb437c967c29f879b5a6 100644 (file)
--- a/common/main.c
+++ b/common/main.c
@@ -229,7 +229,7 @@ void main_loop(bd_t *bd)
                if (len == -1)
                        printf ("<INTERRUPT>\n");
                else
-                       rc = run_command (lastcommand, bd, 0);
+                       rc = run_command (lastcommand, bd, flag);
 
                if (rc <= 0) {
                        /* invalid command or not repeatable, forget it */

diff --git a/include/cmd_mem.h b/include/cmd_mem.h
index 02c6639350aa1388d144b894d32f7891c01458c8..93176038afd60315d666a3063bf92dbabddc8f6f 100644 (file)
--- a/include/cmd_mem.h
+++ b/include/cmd_mem.h
@@ -67,7 +67,7 @@
 #define CMD_TBL_BASE   MK_CMD_TBL_ENTRY(                                       \
        "base",         2,      2,      1,      do_mem_base,                    \
        "base    - print or set address offset\n",                              \
-       "\n    - print address offset fpr memory commands\n"                    \
+       "\n    - print address offset for memory commands\n"                    \
        "base off\n    - set address offset for memory commands to 'off'\n"     \
 ),
 /*