Update CHANGELOG

[u-boot] / common / cmd_mem.c

diff --git a/common/cmd_mem.c b/common/cmd_mem.c
index b95421ad5d55daca3d34c91ee7e1c2abd6f4c9cd..d0fae6b24c23ca87bf6ef9187aaeabe5ff93fc7a 100644 (file)
--- a/common/cmd_mem.c
+++ b/common/cmd_mem.c
@@ -179,7 +179,7 @@ int do_mem_md ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                }
 #endif
                puts ("    ");
-               cp = linebuf;
+               cp = (u_char *)linebuf;
                for (i=0; i<linebytes; i++) {
                        if ((*cp < 0x20) || (*cp > 0x7e))
                                putc ('.');
@@ -253,6 +253,66 @@ int do_mem_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        return 0;
 }
 
+#ifdef CONFIG_MX_CYCLIC
+int do_mem_mdc ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+{
+       int i;
+       ulong count;
+
+       if (argc < 4) {
+               printf ("Usage:\n%s\n", cmdtp->usage);
+               return 1;
+       }
+
+       count = simple_strtoul(argv[3], NULL, 10);
+
+       for (;;) {
+               do_mem_md (NULL, 0, 3, argv);
+
+               /* delay for <count> ms... */
+               for (i=0; i<count; i++)
+                       udelay (1000);
+
+               /* check for ctrl-c to abort... */
+               if (ctrlc()) {
+                       puts("Abort\n");
+                       return 0;
+               }
+       }
+
+       return 0;
+}
+
+int do_mem_mwc ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+{
+       int i;
+       ulong count;
+
+       if (argc < 4) {
+               printf ("Usage:\n%s\n", cmdtp->usage);
+               return 1;
+       }
+
+       count = simple_strtoul(argv[3], NULL, 10);
+
+       for (;;) {
+               do_mem_mw (NULL, 0, 3, argv);
+
+               /* delay for <count> ms... */
+               for (i=0; i<count; i++)
+                       udelay (1000);
+
+               /* check for ctrl-c to abort... */
+               if (ctrlc()) {
+                       puts("Abort\n");
+                       return 0;
+               }
+       }
+
+       return 0;
+}
+#endif /* CONFIG_MX_CYCLIC */
+
 int do_mem_cmp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
        ulong   addr1, addr2, count, ngood;
@@ -370,7 +430,7 @@ int do_mem_cp ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
                puts ("Copy to Flash... ");
 
-               rc = flash_write ((uchar *)addr, dest, count*size);
+               rc = flash_write ((char *)addr, dest, count*size);
                if (rc != 0) {
                        flash_perror (rc);
                        return (1);
@@ -647,7 +707,7 @@ int do_mem_mtest (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 #if defined(CFG_MEMTEST_SCRATCH)
        vu_long *dummy = (vu_long*)CFG_MEMTEST_SCRATCH;
 #else
-       vu_long *dummy = NULL;
+       vu_long *dummy = 0;     /* yes, this is address 0x0, not NULL */
 #endif
        int     j;
        int iterations = 1;
@@ -1214,5 +1274,19 @@ U_BOOT_CMD(
        "    - simple RAM read/write test\n"
 );
 
+#ifdef CONFIG_MX_CYCLIC
+U_BOOT_CMD(
+       mdc,     4,     1,      do_mem_mdc,
+       "mdc     - memory display cyclic\n",
+       "[.b, .w, .l] address count delay(ms)\n    - memory display cyclic\n"
+);
+
+U_BOOT_CMD(
+       mwc,     4,     1,      do_mem_mwc,
+       "mwc     - memory write cyclic\n",
+       "[.b, .w, .l] address value delay(ms)\n    - memory write cyclic\n"
+);
+#endif /* CONFIG_MX_CYCLIC */
+
 #endif
 #endif /* CFG_CMD_MEMORY */