Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

[u-boot] / common / cmd_doc.c

diff --git a/common/cmd_doc.c b/common/cmd_doc.c
index 02502cc810cf438606c0103d89a584771da543a6..5cc90f064d925e21bbe570fe17e33de0de37fb42 100644 (file)
--- a/common/cmd_doc.c
+++ b/common/cmd_doc.c
@@ -14,6 +14,10 @@
 #include <linux/mtd/nftl.h>
 #include <linux/mtd/doc2000.h>
 
+#error This code is broken and will be removed outright in the next release.
+#error If you need diskonchip support, please update the Linux driver in
+#error drivers/mtd/nand/diskonchip.c to work with u-boot.
+
 /*
  * ! BROKEN !
  *
@@ -96,7 +100,7 @@ int do_doc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
     switch (argc) {
     case 0:
     case 1:
-       printf ("Usage:\n%s\n", cmdtp->usage);
+       cmd_usage(cmdtp);
        return 1;
     case 2:
        if (strcmp(argv[1],"info") == 0) {
@@ -121,7 +125,7 @@ int do_doc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                doc_print(&doc_dev_desc[curr_device]);
                return 0;
        }
-       printf ("Usage:\n%s\n", cmdtp->usage);
+       cmd_usage(cmdtp);
        return 1;
     case 3:
        if (strcmp(argv[1],"device") == 0) {
@@ -146,7 +150,7 @@ int do_doc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                return 0;
        }
 
-       printf ("Usage:\n%s\n", cmdtp->usage);
+       cmd_usage(cmdtp);
        return 1;
     default:
        /* at least 4 args */
@@ -182,7 +186,7 @@ int do_doc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
                return ret;
        } else {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                rcode = 1;
        }
 
@@ -191,14 +195,14 @@ int do_doc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 U_BOOT_CMD(
        doc,    5,      1,      do_doc,
-       "doc     - Disk-On-Chip sub-system\n",
+       "Disk-On-Chip sub-system",
        "info  - show available DOC devices\n"
        "doc device [dev] - show or set current device\n"
        "doc read  addr off size\n"
        "doc write addr off size - read/write `size'"
        " bytes starting at offset `off'\n"
        "    to/from memory address `addr'\n"
-       "doc erase off size - erase `size' bytes of DOC from offset `off'\n"
+       "doc erase off size - erase `size' bytes of DOC from offset `off'"
 );
 
 int do_docboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -235,7 +239,7 @@ int do_docboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                offset = simple_strtoul(argv[3], NULL, 16);
                break;
        default:
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                show_boot_progress (-35);
                return 1;
        }
@@ -337,8 +341,8 @@ int do_docboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        docboot,        4,      1,      do_docboot,
-       "docboot - boot from DOC device\n",
-       "loadAddr dev\n"
+       "boot from DOC device",
+       "loadAddr dev"
 );
 
 int doc_rw (struct DiskOnChip* this, int cmd,