Make sure that argv[] argument pointers are not modified.

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

diff --git a/common/cmd_fat.c b/common/cmd_fat.c
index afaf299569bf612b891ae04917585d28d7a2c3f3..ede730804ef8ac57d03356237a77cb49a273c727 100644 (file)
--- a/common/cmd_fat.c
+++ b/common/cmd_fat.c
@@ -30,15 +30,10 @@
 #include <net.h>
 #include <ata.h>
 #include <part.h>
-
-#if (CONFIG_COMMANDS & CFG_CMD_FAT)
-
-#undef DEBUG
-
 #include <fat.h>
 
 
-int do_fat_fsload (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_fat_fsload (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        long size;
        unsigned long offset;
@@ -93,13 +88,13 @@ int do_fat_fsload (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        fatload,        6,      0,      do_fat_fsload,
-       "fatload - load binary file from a dos filesystem\n",
+       "load binary file from a dos filesystem",
        "<interface> <dev[:part]>  <addr> <filename> [bytes]\n"
        "    - load binary file 'filename' from 'dev' on 'interface'\n"
-       "      to address 'addr' from dos filesystem\n"
+       "      to address 'addr' from dos filesystem"
 );
 
-int do_fat_ls (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_fat_ls (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        char *filename = "/";
        int ret;
@@ -141,12 +136,12 @@ int do_fat_ls (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        fatls,  4,      1,      do_fat_ls,
-       "fatls   - list files in a directory (default /)\n",
+       "list files in a directory (default /)",
        "<interface> <dev[:part]> [directory]\n"
-       "    - list files from 'dev' on 'interface' in a 'directory'\n"
+       "    - list files from 'dev' on 'interface' in a 'directory'"
 );
 
-int do_fat_fsinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_fat_fsinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        int dev=0;
        int part=1;
@@ -179,9 +174,9 @@ int do_fat_fsinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        fatinfo,        3,      1,      do_fat_fsinfo,
-       "fatinfo - print information about filesystem\n",
+       "print information about filesystem",
        "<interface> <dev[:part]>\n"
-       "    - print information about filesystem from 'dev' on 'interface'\n"
+       "    - print information about filesystem from 'dev' on 'interface'"
 );
 
 #ifdef NOT_IMPLEMENTED_YET
@@ -193,7 +188,7 @@ int find_fat_partition (void)
        unsigned char *part_table;
        unsigned char buffer[ATA_BLOCKSIZE];
 
-       for (i = 0; i < CFG_IDE_MAXDEVICE; i++) {
+       for (i = 0; i < CONFIG_SYS_IDE_MAXDEVICE; i++) {
                dev_desc = ide_get_dev (i);
                if (!dev_desc) {
                        debug ("couldn't get ide device!\n");
@@ -232,7 +227,7 @@ int find_fat_partition (void)
 }
 
 int
-do_fat_dump (cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
+do_fat_dump (cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char * const argv[])
 {
        __u8 block[1024];
        int ret;
@@ -323,5 +318,3 @@ void hexdump (int cnt, unsigned char *data)
        }
 }
 #endif /* NOT_IMPLEMENTED_YET */
-
-#endif /* CFG_CMD_FAT */