Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

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

diff --git a/common/cmd_fdos.c b/common/cmd_fdos.c
index 4b411b3d37f4e99890347dd793354a3460b29dd7..8ea1140e7fe880d145218eaa20504152b7c0dd96 100644 (file)
--- a/common/cmd_fdos.c
+++ b/common/cmd_fdos.c
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Stäubli Faverges - <www.staubli.com>
+ * Stäubli Faverges - <www.staubli.com>
  * Pierre AUBERT  p.aubert@staubli.com
  *
  * See file CREDITS for list of people who contributed to this
@@ -31,115 +31,110 @@
 #include <command.h>
 #include <fdc.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_FDOS)
-
 /*-----------------------------------------------------------------------------
- * do_fdosboot -- 
+ * do_fdosboot --
  *-----------------------------------------------------------------------------
  */
-int do_fdosboot(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_fdosboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
     char *name;
     char *ep;
     int size;
-    int rcode = 0;
-    char buf [10];
-    int drive = CFG_FDC_DRIVE_NUMBER;
-    
+    int drive = CONFIG_SYS_FDC_DRIVE_NUMBER;
+
     /* pre-set load_addr */
     if ((ep = getenv("loadaddr")) != NULL) {
-        load_addr = simple_strtoul(ep, NULL, 16);
+       load_addr = simple_strtoul(ep, NULL, 16);
     }
 
     /* pre-set Boot file name */
     if ((name = getenv("bootfile")) == NULL) {
-        name = "uImage";
+       name = "uImage";
     }
 
     switch (argc) {
     case 1:
-        break;
+       break;
     case 2:
        /* only one arg - accept two forms:
-         * just load address, or just boot file name.
-         * The latter form must be written "filename" here.
-         */        
-        if (argv[1][0] == '"') {       /* just boot filename */
-            name = argv [1];
-        } else {                       /* load address */
-            load_addr = simple_strtoul(argv[1], NULL, 16);
-        }
-        break;
+        * just load address, or just boot file name.
+        * The latter form must be written "filename" here.
+        */
+       if (argv[1][0] == '"') {        /* just boot filename */
+           name = argv [1];
+       } else {                        /* load address */
+           load_addr = simple_strtoul(argv[1], NULL, 16);
+       }
+       break;
     case 3:
-        load_addr = simple_strtoul(argv[1], NULL, 16);
-        name = argv [2];
-        break;
+       load_addr = simple_strtoul(argv[1], NULL, 16);
+       name = argv [2];
+       break;
     default:
-        printf ("Usage:\n%s\n", cmdtp->usage);
-        break;
+       return CMD_RET_USAGE;
     }
 
     /* Init physical layer                                                   */
     if (!fdc_fdos_init (drive)) {
-        return (-1);
+       return (-1);
     }
-    
+
     /* Open file                                                             */
     if (dos_open (name) < 0) {
-        printf ("Unable to open %s\n", name);
-        return 1;
+       printf ("Unable to open %s\n", name);
+       return 1;
     }
     if ((size = dos_read (load_addr)) < 0) {
-        printf ("boot error\n");
-        return 1;
+       printf ("boot error\n");
+       return 1;
     }
     flush_cache (load_addr, size);
 
-    sprintf(buf, "%x", size);
-    setenv("filesize", buf);
+    setenv_hex("filesize", size);
 
     printf("Floppy DOS load complete: %d bytes loaded to 0x%lx\n",
-           size, load_addr);
-    
-    /* Check if we should attempt an auto-start */
-    if (((ep = getenv("autostart")) != NULL) && (strcmp(ep,"yes") == 0)) {
-        char *local_args[2];
-        extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
-        local_args[0] = argv[0];
-        local_args[1] = NULL;
-        printf ("Automatic boot of image at addr 0x%08lX ...\n", load_addr);
-        rcode = do_bootm (cmdtp, 0, 1, local_args);
-    }
-    return rcode;
+          size, load_addr);
+
+    return bootm_maybe_autostart(cmdtp, argv[0]);
 }
 
 /*-----------------------------------------------------------------------------
- * do_fdosls -- 
+ * do_fdosls --
  *-----------------------------------------------------------------------------
  */
-int do_fdosls(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_fdosls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
     char *path = "";
-    int drive = CFG_FDC_DRIVE_NUMBER;
-    
+    int drive = CONFIG_SYS_FDC_DRIVE_NUMBER;
+
     switch (argc) {
     case 1:
-        break;
+       break;
     case 2:
-        path = argv [1];
-        break;
+       path = argv [1];
+       break;
     }
 
     /* Init physical layer                                                   */
     if (!fdc_fdos_init (drive)) {
-        return (-1);
+       return (-1);
     }
     /* Open directory                                                        */
     if (dos_open (path) < 0) {
-        printf ("Unable to open %s\n", path);
-        return 1;
+       printf ("Unable to open %s\n", path);
+       return 1;
     }
     return (dos_dir ());
 }
 
-#endif
+U_BOOT_CMD(
+       fdosboot,       3,      0,      do_fdosboot,
+       "boot from a dos floppy file",
+       "[loadAddr] [filename]"
+);
+
+U_BOOT_CMD(
+       fdosls, 2,      0,      do_fdosls,
+       "list files in a directory",
+       "[directory]"
+);