cmd_bdinfo: simplify local static funcs a bit

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

diff --git a/common/cmd_fdos.c b/common/cmd_fdos.c
index bcf98d9e4b9dbc432af75fd3ef26260bedcac6d0..04a5e01947d2d72dd8a6e97b7c1b03a9274bce1a 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
@@ -35,12 +35,11 @@
  * 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 [12];
     int drive = CONFIG_SYS_FDC_DRIVE_NUMBER;
 
@@ -73,8 +72,7 @@ int do_fdosboot(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        name = argv [2];
        break;
     default:
-       cmd_usage(cmdtp);
-       break;
+       return cmd_usage(cmdtp);
     }
 
     /* Init physical layer                                                   */
@@ -99,23 +97,14 @@ int do_fdosboot(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
     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;
+    return bootm_maybe_autostart(cmdtp, argv[0]);
 }
 
 /*-----------------------------------------------------------------------------
  * 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 = CONFIG_SYS_FDC_DRIVE_NUMBER;
@@ -143,11 +132,11 @@ int do_fdosls(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
        fdosboot,       3,      0,      do_fdosboot,
        "boot from a dos floppy file",
-       "[loadAddr] [filename]\n"
+       "[loadAddr] [filename]"
 );
 
 U_BOOT_CMD(
        fdosls, 2,      0,      do_fdosls,
        "list files in a directory",
-       "[directory]\n"
+       "[directory]"
 );