cmd_ext2.c: fix compile warnings

[u-boot] / common / cmd_mem.c

diff --git a/common/cmd_mem.c b/common/cmd_mem.c
index c209d62d8ebee570265d6a737d475a6536f0036b..2d4fc2a419eb4702ea61d954b5bb9f4f9bc292df 100644 (file)
--- a/common/cmd_mem.c
+++ b/common/cmd_mem.c
@@ -29,9 +29,6 @@
 
 #include <common.h>
 #include <command.h>
-#if defined(CONFIG_CMD_MMC)
-#include <mmc.h>
-#endif
 #ifdef CONFIG_HAS_DATAFLASH
 #include <dataflash.h>
 #endif
@@ -77,7 +74,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 +170,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 +214,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 +243,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 +274,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 +358,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;
        }
 
@@ -404,46 +401,6 @@ int do_mem_cp ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        }
 #endif
 
-#if defined(CONFIG_CMD_MMC)
-       if (mmc2info(dest)) {
-               int rc;
-
-               puts ("Copy to MMC... ");
-               switch (rc = mmc_write ((uchar *)addr, dest, count*size)) {
-               case 0:
-                       putc ('\n');
-                       return 1;
-               case -1:
-                       puts ("failed\n");
-                       return 1;
-               default:
-                       printf ("%s[%d] FIXME: rc=%d\n",__FILE__,__LINE__,rc);
-                       return 1;
-               }
-               puts ("done\n");
-               return 0;
-       }
-
-       if (mmc2info(addr)) {
-               int rc;
-
-               puts ("Copy from MMC... ");
-               switch (rc = mmc_read (addr, (uchar *)dest, count*size)) {
-               case 0:
-                       putc ('\n');
-                       return 1;
-               case -1:
-                       puts ("failed\n");
-                       return 1;
-               default:
-                       printf ("%s[%d] FIXME: rc=%d\n",__FILE__,__LINE__,rc);
-                       return 1;
-               }
-               puts ("done\n");
-               return 0;
-       }
-#endif
-
 #ifdef CONFIG_HAS_DATAFLASH
        /* Check if we are copying from RAM or Flash to DataFlash */
        if (addr_dataflash(dest) && !addr_dataflash(addr)){
@@ -525,7 +482,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 +553,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;
        }
 
@@ -1001,7 +958,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;
        }
 
@@ -1106,7 +1063,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;
        }
 
@@ -1142,7 +1099,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;
        }
 
@@ -1202,7 +1159,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;
        }
 
@@ -1214,39 +1171,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"
 );
 
@@ -1254,7 +1211,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"
 );
 
@@ -1262,7 +1219,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"
 );
@@ -1271,14 +1228,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"
 );
@@ -1286,7 +1243,7 @@ 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"
 );
@@ -1294,7 +1251,7 @@ U_BOOT_CMD(
 
 U_BOOT_CMD(
        mtest,  5,      1,      do_mem_mtest,
-       "mtest   - simple RAM test\n",
+       "simple RAM test",
        "[start [end [pattern [iterations]]]]\n"
        "    - simple RAM read/write test\n"
 );
@@ -1302,13 +1259,13 @@ U_BOOT_CMD(
 #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 */
@@ -1316,7 +1273,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 */