arm: bugfix: replace ble with blo in start.S files

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

diff --git a/common/cmd_fdos.c b/common/cmd_fdos.c
index 8257e703d72d87f53ccbb9199b43e0a140cdfa9e..a8822d91b07c5c64dd5106de5eba136faa2c041b 100644 (file)
--- a/common/cmd_fdos.c
+++ b/common/cmd_fdos.c
@@ -31,20 +31,18 @@
 #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 [10];
-    int drive = CFG_FDC_DRIVE_NUMBER;
+    char buf [12];
+    int drive = CONFIG_SYS_FDC_DRIVE_NUMBER;
 
     /* pre-set load_addr */
     if ((ep = getenv("loadaddr")) != NULL) {
@@ -75,8 +73,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_usage(cmdtp);
     }
 
     /* Init physical layer                                                   */
@@ -117,10 +114,10 @@ int do_fdosboot(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
  * 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:
@@ -142,16 +139,14 @@ int do_fdosls(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
     return (dos_dir ());
 }
 
-cmd_tbl_t U_BOOT_CMD(FDOS_BOOT) = MK_CMD_ENTRY(
-       "fdosboot",     3,      0,      do_fdosboot,
-       "fdosboot- boot from a dos floppy file\n",
-       "[loadAddr] [filename]\n"
+U_BOOT_CMD(
+       fdosboot,       3,      0,      do_fdosboot,
+       "boot from a dos floppy file",
+       "[loadAddr] [filename]"
 );
 
-cmd_tbl_t U_BOOT_CMD(FDOS_LS) = MK_CMD_ENTRY(
-       "fdosls",       2,      0,      do_fdosls,
-       "fdosls  - list files in a directory\n",
-       "[directory]\n"
+U_BOOT_CMD(
+       fdosls, 2,      0,      do_fdosls,
+       "list files in a directory",
+       "[directory]"
 );
-
-#endif /* CONFIG_COMMANDS & CFG_CMD_FDOS */