X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=common%2Fcmd_fdos.c;h=fbee8614cabc7f3e23511a17e678af1552ff28c3;hb=11da5d821324991f1e6a79bde1a0908ffb9bcf36;hp=dc02b3595c2a64035faf7021e7a3013b459c87ee;hpb=fbe4b5cbdea438ccec0d93de443f367f3ba46196;p=oweals%2Fu-boot.git

diff --git a/common/cmd_fdos.c b/common/cmd_fdos.c
index dc02b3595c..fbee8614ca 100644
--- 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,20 +31,17 @@
 #include <command.h>
 #include <fdc.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_FDOS)
-
 /*-----------------------------------------------------------------------------
  * 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 = CFG_FDC_DRIVE_NUMBER;
+    int drive = CONFIG_SYS_FDC_DRIVE_NUMBER;
 
     /* pre-set load_addr */
     if ((ep = getenv("loadaddr")) != NULL) {
@@ -75,8 +72,7 @@ int do_fdosboot(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 	name = argv [2];
 	break;
     default:
-	printf ("Usage:\n%s\n", cmdtp->usage);
-	break;
+	return CMD_RET_USAGE;
     }
 
     /* Init physical layer                                                   */
@@ -101,26 +97,17 @@ 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 = CFG_FDC_DRIVE_NUMBER;
+    int drive = CONFIG_SYS_FDC_DRIVE_NUMBER;
 
     switch (argc) {
     case 1:
@@ -144,14 +131,12 @@ int do_fdosls(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
 	fdosboot,	3,	0,	do_fdosboot,
-	"fdosboot- boot from a dos floppy file\n",
-	"[loadAddr] [filename]\n"
+	"boot from a dos floppy file",
+	"[loadAddr] [filename]"
 );
 
 U_BOOT_CMD(
 	fdosls,	2,	0,	do_fdosls,
-	"fdosls  - list files in a directory\n",
-	"[directory]\n"
+	"list files in a directory",
+	"[directory]"
 );
-
-#endif	/* CONFIG_COMMANDS & CFG_CMD_FDOS */