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

[karo-tx-uboot.git] / common / cmd_mfsl.c

diff --git a/common/cmd_mfsl.c b/common/cmd_mfsl.c
index c2442eed136d27e13fe4c49d1968882f00b25d6a..eeef2cddab6bd77e0ed7043eb379097cfe80381c 100644 (file)
--- a/common/cmd_mfsl.c
+++ b/common/cmd_mfsl.c
@@ -31,14 +31,14 @@
 #include <command.h>
 #include <asm/asm.h>
 
-int do_frd (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+int do_frd (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        unsigned int fslnum;
        unsigned int num;
        unsigned int blocking;
 
        if (argc < 2) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -46,7 +46,7 @@ int do_frd (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        blocking = (unsigned int)simple_strtoul (argv[2], NULL, 16);
        if (fslnum < 0 || fslnum >= XILINX_FSL_NUMBER) {
                puts ("Bad number of FSL\n");
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -189,14 +189,14 @@ int do_frd (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        return 0;
 }
 
-int do_fwr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+int do_fwr (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        unsigned int fslnum;
        unsigned int num;
        unsigned int blocking;
 
        if (argc < 3) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -204,7 +204,7 @@ int do_fwr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        num = (unsigned int)simple_strtoul (argv[2], NULL, 16);
        blocking = (unsigned int)simple_strtoul (argv[3], NULL, 16);
        if (fslnum < 0 || fslnum >= XILINX_FSL_NUMBER) {
-               printf ("Bad number of FSL\nUsage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -348,13 +348,13 @@ int do_fwr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 
 }
 
-int do_rspr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+int do_rspr (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        unsigned int reg = 0;
        unsigned int val = 0;
 
        if (argc < 2) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
        reg = (unsigned int)simple_strtoul (argv[1], NULL, 16);
@@ -389,25 +389,24 @@ int do_rspr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 /***************************************************/
 
 U_BOOT_CMD (frd, 3, 1, do_frd,
-               "frd     - read data from FSL\n",
+               "read data from FSL",
                "- [fslnum [0|1|2|3]]\n"
                " 0 - non blocking data read\n"
                " 1 - non blocking control read\n"
                " 2 - blocking data read\n"
-               " 3 - blocking control read\n");
-
+               " 3 - blocking control read");
 
 U_BOOT_CMD (fwr, 4, 1, do_fwr,
-               "fwr     - write data to FSL\n",
+               "write data to FSL",
                "- [fslnum [0|1|2|3]]\n"
                " 0 - non blocking data write\n"
                " 1 - non blocking control write\n"
                " 2 - blocking data write\n"
-               " 3 - blocking control write\n");
+               " 3 - blocking control write");
 
 U_BOOT_CMD (rspr, 3, 1, do_rspr,
-               "rspr    - read/write special purpose register\n",
+               "read/write special purpose register",
                "- reg_num [write value] read/write special purpose register\n"
                " 1 - MSR - Machine status register\n"
                " 3 - EAR - Exception address register\n"
-               " 5 - ESR - Exception status register\n");
+               " 5 - ESR - Exception status register");