ARM Update mach-types

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

diff --git a/common/cmd_fat.c b/common/cmd_fat.c
index 150a2ea67c889193de688ff7e71895aeabab57cc..f3089a296e05e5743446c7be395a688198488a3d 100644 (file)
--- a/common/cmd_fat.c
+++ b/common/cmd_fat.c
@@ -29,50 +29,10 @@
 #include <s_record.h>
 #include <net.h>
 #include <ata.h>
-
-#if (CONFIG_COMMANDS & CFG_CMD_FAT)
-
-#undef DEBUG
-
+#include <part.h>
 #include <fat.h>
 
 
-block_dev_desc_t *get_dev (char* ifname, int dev)
-{
-#if (CONFIG_COMMANDS & CFG_CMD_IDE)
-       if (strncmp(ifname,"ide",3)==0) {
-               extern block_dev_desc_t * ide_get_dev(int dev);
-               return(ide_get_dev(dev));
-       }
-#endif
-#if (CONFIG_COMMANDS & CFG_CMD_SCSI)
-       if (strncmp(ifname,"scsi",4)==0) {
-               extern block_dev_desc_t * scsi_get_dev(int dev);
-               return(scsi_get_dev(dev));
-       }
-#endif
-#if ((CONFIG_COMMANDS & CFG_CMD_USB) && defined(CONFIG_USB_STORAGE))
-       if (strncmp(ifname,"usb",3)==0) {
-               extern block_dev_desc_t * usb_stor_get_dev(int dev);
-               return(usb_stor_get_dev(dev));
-       }
-#endif
-#if defined(CONFIG_MMC)
-       if (strncmp(ifname,"mmc",3)==0) {
-               extern block_dev_desc_t *  mmc_get_dev(int dev);
-               return(mmc_get_dev(dev));
-       }
-#endif
-#if defined(CONFIG_SYSTEMACE)
-       if (strcmp(ifname,"ace")==0) {
-               extern block_dev_desc_t *  systemace_get_dev(int dev);
-               return(systemace_get_dev(dev));
-       }
-#endif
-       return NULL;
-}
-
-
 int do_fat_fsload (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
        long size;
@@ -86,7 +46,7 @@ int do_fat_fsload (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
        if (argc < 5) {
                printf ("usage: fatload <interface> <dev[:part]> <addr> <filename> [bytes]\n");
-               return (0);
+               return 1;
        }
        dev = (int)simple_strtoul (argv[2], &ep, 16);
        dev_desc=get_dev(argv[1],dev);
@@ -114,23 +74,24 @@ int do_fat_fsload (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
        if(size==-1) {
                printf("\n** Unable to read \"%s\" from %s %d:%d **\n",argv[4],argv[1],dev,part);
-       } else {
-               printf ("\n%ld bytes read\n", size);
-
-               sprintf(buf, "%lX", size);
-               setenv("filesize", buf);
+               return 1;
        }
 
-       return size;
+       printf ("\n%ld bytes read\n", size);
+
+       sprintf(buf, "%lX", size);
+       setenv("filesize", buf);
+
+       return 0;
 }
 
 
 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[])
@@ -175,9 +136,9 @@ 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[])
@@ -213,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
@@ -227,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");
@@ -357,5 +318,3 @@ void hexdump (int cnt, unsigned char *data)
        }
 }
 #endif /* NOT_IMPLEMENTED_YET */
-
-#endif /* CFG_CMD_FAT */