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 6470baceb877c1b7524b6a33d62ec745ee965bf0..eeef2cddab6bd77e0ed7043eb379097cfe80381c 100644 (file)
--- a/common/cmd_mfsl.c
+++ b/common/cmd_mfsl.c
@@ -31,7 +31,7 @@
 #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;
@@ -189,7 +189,7 @@ 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;
@@ -348,7 +348,7 @@ 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;
@@ -394,8 +394,7 @@ U_BOOT_CMD (frd, 3, 1, do_frd,
                " 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,
                "write data to FSL",
@@ -403,11 +402,11 @@ U_BOOT_CMD (fwr, 4, 1, do_fwr,
                " 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,
                "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");