usb.h: use standard __LITTLE_ENDIAN from Linux headers

[u-boot] / common / cmd_mem.c

diff --git a/common/cmd_mem.c b/common/cmd_mem.c
index 400cfd7470eb5d88daf6a6f289ef483d72316d5b..a203e0d3e4dd021a084c214f5c36c8e6b6798b9c 100644 (file)
--- a/common/cmd_mem.c
+++ b/common/cmd_mem.c
@@ -77,7 +77,7 @@ int do_mem_md ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        length = dp_last_length;
 
        if (argc < 2) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -173,7 +173,7 @@ int do_mem_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        int     size;
 
        if ((argc < 3) || (argc > 4)) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -217,7 +217,7 @@ int do_mem_mdc ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        ulong count;
 
        if (argc < 4) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -246,7 +246,7 @@ int do_mem_mwc ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        ulong count;
 
        if (argc < 4) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -277,7 +277,7 @@ int do_mem_cmp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        int     rcode = 0;
 
        if (argc != 4) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -361,7 +361,7 @@ int do_mem_cp ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        int     size;
 
        if (argc != 4) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -525,7 +525,7 @@ int do_mem_loop (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        volatile u_char *cp;
 
        if (argc < 3) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -596,7 +596,7 @@ int do_mem_loopw (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        volatile u_char *cp;
 
        if (argc < 4) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -672,6 +672,8 @@ int do_mem_mtest (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        ulong   val;
        ulong   readback;
        int     rcode = 0;
+       int iterations = 1;
+       int iteration_limit;
 
 #if defined(CONFIG_SYS_ALT_MEMTEST)
        vu_long len;
@@ -687,7 +689,6 @@ int do_mem_mtest (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        vu_long *dummy = 0;     /* yes, this is address 0x0, not NULL */
 #endif
        int     j;
-       int iterations = 1;
 
        static const ulong bitpattern[] = {
                0x00000001,     /* single bit */
@@ -704,23 +705,25 @@ int do_mem_mtest (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        ulong   pattern;
 #endif
 
-       if (argc > 1) {
+       if (argc > 1)
                start = (ulong *)simple_strtoul(argv[1], NULL, 16);
-       } else {
+       else
                start = (ulong *)CONFIG_SYS_MEMTEST_START;
-       }
 
-       if (argc > 2) {
+       if (argc > 2)
                end = (ulong *)simple_strtoul(argv[2], NULL, 16);
-       } else {
+       else
                end = (ulong *)(CONFIG_SYS_MEMTEST_END);
-       }
 
-       if (argc > 3) {
+       if (argc > 3)
                pattern = (ulong)simple_strtoul(argv[3], NULL, 16);
-       } else {
+       else
                pattern = 0;
-       }
+
+       if (argc > 4)
+               iteration_limit = (ulong)simple_strtoul(argv[4], NULL, 16);
+       else
+               iteration_limit = 0;
 
 #if defined(CONFIG_SYS_ALT_MEMTEST)
        printf ("Testing %08x ... %08x:\n", (uint)start, (uint)end);
@@ -733,8 +736,15 @@ int do_mem_mtest (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        return 1;
                }
 
+
+               if (iteration_limit && iterations > iteration_limit) {
+                       printf("Tested %d iteration(s) without errors.\n",
+                               iterations-1);
+                       return 0;
+               }
+
                printf("Iteration: %6d\r", iterations);
-               PRINTF("Iteration: %6d\n", iterations);
+               PRINTF("\n");
                iterations++;
 
                /*
@@ -926,6 +936,13 @@ int do_mem_mtest (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        return 1;
                }
 
+               if (iteration_limit && iterations > iteration_limit) {
+                       printf("Tested %d iteration(s) without errors.\n",
+                               iterations-1);
+                       return 0;
+               }
+               ++iterations;
+
                printf ("\rPattern %08lX  Writing..."
                        "%12s"
                        "\b\b\b\b\b\b\b\b\b\b",
@@ -984,7 +1001,7 @@ mod_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char *argv[])
        extern char console_buffer[];
 
        if (argc != 2) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -1089,7 +1106,7 @@ int do_mem_crc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        ulong *ptr;
 
        if (argc < 3) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -1125,7 +1142,7 @@ int do_mem_crc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
        if (argc < 3) {
   usage:
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -1185,7 +1202,7 @@ int do_unzip ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        dst = simple_strtoul(argv[2], NULL, 16);
                        break;
                default:
-                       printf ("Usage:\n%s\n", cmdtp->usage);
+                       cmd_usage(cmdtp);
                        return 1;
        }
 
@@ -1197,39 +1214,39 @@ int do_unzip ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 /**************************************************/
 U_BOOT_CMD(
        md,     3,      1,      do_mem_md,
-       "md     - memory display\n",
+       "memory display",
        "[.b, .w, .l] address [# of objects]\n    - memory display\n"
 );
 
 
 U_BOOT_CMD(
        mm,     2,      1,      do_mem_mm,
-       "mm     - memory modify (auto-incrementing)\n",
+       "memory modify (auto-incrementing)",
        "[.b, .w, .l] address\n" "    - memory modify, auto increment address\n"
 );
 
 
 U_BOOT_CMD(
        nm,     2,      1,      do_mem_nm,
-       "nm     - memory modify (constant address)\n",
+       "memory modify (constant address)",
        "[.b, .w, .l] address\n    - memory modify, read and keep address\n"
 );
 
 U_BOOT_CMD(
        mw,     4,      1,      do_mem_mw,
-       "mw     - memory write (fill)\n",
+       "memory write (fill)",
        "[.b, .w, .l] address value [count]\n   - write memory\n"
 );
 
 U_BOOT_CMD(
        cp,     4,      1,      do_mem_cp,
-       "cp     - memory copy\n",
+       "memory copy",
        "[.b, .w, .l] source target count\n    - copy memory\n"
 );
 
 U_BOOT_CMD(
        cmp,    4,      1,      do_mem_cmp,
-       "cmp    - memory compare\n",
+       "memory compare",
        "[.b, .w, .l] addr1 addr2 count\n    - compare memory\n"
 );
 
@@ -1237,7 +1254,7 @@ U_BOOT_CMD(
 
 U_BOOT_CMD(
        crc32,  4,      1,      do_mem_crc,
-       "crc32  - checksum calculation\n",
+       "checksum calculation",
        "address count [addr]\n    - compute CRC32 checksum [save at addr]\n"
 );
 
@@ -1245,7 +1262,7 @@ U_BOOT_CMD(
 
 U_BOOT_CMD(
        crc32,  5,      1,      do_mem_crc,
-       "crc32  - checksum calculation\n",
+       "checksum calculation",
        "address count [addr]\n    - compute CRC32 checksum [save at addr]\n"
        "-v address count crc\n    - verify crc of memory area\n"
 );
@@ -1254,14 +1271,14 @@ U_BOOT_CMD(
 
 U_BOOT_CMD(
        base,   2,      1,      do_mem_base,
-       "base   - print or set address offset\n",
+       "print or set address offset",
        "\n    - print address offset for memory commands\n"
        "base off\n    - set address offset for memory commands to 'off'\n"
 );
 
 U_BOOT_CMD(
        loop,   3,      1,      do_mem_loop,
-       "loop   - infinite loop on address range\n",
+       "infinite loop on address range",
        "[.b, .w, .l] address number_of_objects\n"
        "    - loop on a set of addresses\n"
 );
@@ -1269,29 +1286,29 @@ U_BOOT_CMD(
 #ifdef CONFIG_LOOPW
 U_BOOT_CMD(
        loopw,  4,      1,      do_mem_loopw,
-       "loopw  - infinite write loop on address range\n",
+       "infinite write loop on address range",
        "[.b, .w, .l] address number_of_objects data_to_write\n"
        "    - loop on a set of addresses\n"
 );
 #endif /* CONFIG_LOOPW */
 
 U_BOOT_CMD(
-       mtest,  4,      1,      do_mem_mtest,
-       "mtest  - simple RAM test\n",
-       "[start [end [pattern]]]\n"
+       mtest,  5,      1,      do_mem_mtest,
+       "simple RAM test",
+       "[start [end [pattern [iterations]]]]\n"
        "    - simple RAM read/write test\n"
 );
 
 #ifdef CONFIG_MX_CYCLIC
 U_BOOT_CMD(
        mdc,    4,      1,      do_mem_mdc,
-       "mdc    - memory display cyclic\n",
+       "memory display cyclic",
        "[.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",
+       "memory write cyclic",
        "[.b, .w, .l] address value delay(ms)\n    - memory write cyclic\n"
 );
 #endif /* CONFIG_MX_CYCLIC */
@@ -1299,7 +1316,7 @@ U_BOOT_CMD(
 #ifdef CONFIG_CMD_UNZIP
 U_BOOT_CMD(
        unzip,  4,      1,      do_unzip,
-       "unzip - unzip a memory region\n",
+       "unzip a memory region",
        "srcaddr dstaddr [dstsize]\n"
 );
 #endif /* CONFIG_CMD_UNZIP */