]> git.sur5r.net Git - u-boot/commitdiff
combine block device load commands into common function
authorRob Herring <rob.herring@calxeda.com>
Fri, 21 Sep 2012 04:02:30 +0000 (04:02 +0000)
committerTom Rini <trini@ti.com>
Tue, 25 Sep 2012 21:43:19 +0000 (14:43 -0700)
All the raw block load commands duplicate the same code. Starting with
the ide version as it has progress updates convert ide, usb, and scsi boot
commands to all use a common version.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
common/Makefile
common/cmd_disk.c [new file with mode: 0644]
common/cmd_ide.c
common/cmd_scsi.c
common/cmd_usb.c
include/command.h

index 22e8a6fb35d2b83a37027085742240efc5fee40e..482795ed142dae323b2e294855757359a69a2fb6 100644 (file)
@@ -34,6 +34,7 @@ COBJS-$(CONFIG_SYS_HUSH_PARSER) += hush.o
 COBJS-y += s_record.o
 COBJS-$(CONFIG_SERIAL_MULTI) += serial.o
 COBJS-y += xyzModem.o
+COBJS-y += cmd_disk.o
 
 # core command
 COBJS-y += cmd_boot.o
diff --git a/common/cmd_disk.c b/common/cmd_disk.c
new file mode 100644 (file)
index 0000000..e73fc4e
--- /dev/null
@@ -0,0 +1,183 @@
+/*
+ * (C) Copyright 2000-2011
+ * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ */
+#include <common.h>
+#include <command.h>
+
+int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc,
+                   char *const argv[])
+{
+       char *boot_device = NULL;
+       char *ep;
+       int dev, part = 0;
+       ulong addr, cnt;
+       disk_partition_t info;
+       image_header_t *hdr;
+       block_dev_desc_t *dev_desc;
+
+#if defined(CONFIG_FIT)
+       const void *fit_hdr = NULL;
+#endif
+
+       bootstage_mark(BOOTSTAGE_ID_IDE_START);
+       switch (argc) {
+       case 1:
+               addr = CONFIG_SYS_LOAD_ADDR;
+               boot_device = getenv("bootdevice");
+               break;
+       case 2:
+               addr = simple_strtoul(argv[1], NULL, 16);
+               boot_device = getenv("bootdevice");
+               break;
+       case 3:
+               addr = simple_strtoul(argv[1], NULL, 16);
+               boot_device = argv[2];
+               break;
+       default:
+               bootstage_error(BOOTSTAGE_ID_IDE_ADDR);
+               return CMD_RET_USAGE;
+       }
+       bootstage_mark(BOOTSTAGE_ID_IDE_ADDR);
+
+       if (!boot_device) {
+               puts("\n** No boot device **\n");
+               bootstage_error(BOOTSTAGE_ID_IDE_BOOT_DEVICE);
+               return 1;
+       }
+       bootstage_mark(BOOTSTAGE_ID_IDE_BOOT_DEVICE);
+
+       dev = simple_strtoul(boot_device, &ep, 16);
+
+       dev_desc = get_dev(intf, dev);
+       if (dev_desc->type == DEV_TYPE_UNKNOWN) {
+               printf("\n** Device %d not available\n", dev);
+               bootstage_error(BOOTSTAGE_ID_IDE_TYPE);
+               return 1;
+       }
+       bootstage_mark(BOOTSTAGE_ID_IDE_TYPE);
+
+       if (*ep) {
+               if (*ep != ':') {
+                       puts("\n** Invalid boot device, use `dev[:part]' **\n");
+                       bootstage_error(BOOTSTAGE_ID_IDE_PART);
+                       return 1;
+               }
+               part = simple_strtoul(++ep, NULL, 16);
+       }
+       bootstage_mark(BOOTSTAGE_ID_IDE_PART);
+
+       if (get_partition_info(dev_desc, part, &info)) {
+               bootstage_error(BOOTSTAGE_ID_IDE_PART_INFO);
+               return 1;
+       }
+       bootstage_mark(BOOTSTAGE_ID_IDE_PART_INFO);
+
+       if ((strncmp((char *)info.type, BOOT_PART_TYPE, sizeof(info.type)) != 0)
+           &&
+           (strncmp((char *)info.type, BOOT_PART_COMP, sizeof(info.type)) != 0)
+          ) {
+               printf("\n** Invalid partition type \"%.32s\"" " (expect \""
+                       BOOT_PART_TYPE "\")\n",
+                       info.type);
+               bootstage_error(BOOTSTAGE_ID_IDE_PART_TYPE);
+               return 1;
+       }
+       bootstage_mark(BOOTSTAGE_ID_IDE_PART_TYPE);
+
+       printf("\nLoading from disk device %d, partition %d: "
+              "Name: %.32s  Type: %.32s\n", dev, part, info.name, info.type);
+
+       debug("First Block: %ld,  # of blocks: %ld, Block Size: %ld\n",
+             info.start, info.size, info.blksz);
+
+       if (dev_desc->block_read(dev, info.start, 1, (ulong *) addr) != 1) {
+               printf("** Read error on %d:%d\n", dev, part);
+               bootstage_error(BOOTSTAGE_ID_IDE_PART_READ);
+               return 1;
+       }
+       bootstage_mark(BOOTSTAGE_ID_IDE_PART_READ);
+
+       switch (genimg_get_format((void *) addr)) {
+       case IMAGE_FORMAT_LEGACY:
+               hdr = (image_header_t *) addr;
+
+               bootstage_mark(BOOTSTAGE_ID_IDE_FORMAT);
+
+               if (!image_check_hcrc(hdr)) {
+                       puts("\n** Bad Header Checksum **\n");
+                       bootstage_error(BOOTSTAGE_ID_IDE_CHECKSUM);
+                       return 1;
+               }
+               bootstage_mark(BOOTSTAGE_ID_IDE_CHECKSUM);
+
+               image_print_contents(hdr);
+
+               cnt = image_get_image_size(hdr);
+               break;
+#if defined(CONFIG_FIT)
+       case IMAGE_FORMAT_FIT:
+               fit_hdr = (const void *) addr;
+               puts("Fit image detected...\n");
+
+               cnt = fit_get_size(fit_hdr);
+               break;
+#endif
+       default:
+               bootstage_error(BOOTSTAGE_ID_IDE_FORMAT);
+               puts("** Unknown image type\n");
+               return 1;
+       }
+
+       cnt += info.blksz - 1;
+       cnt /= info.blksz;
+       cnt -= 1;
+
+       if (dev_desc->block_read(dev, info.start + 1, cnt,
+                                        (ulong *)(addr + info.blksz)) != cnt) {
+               printf("** Read error on %d:%d\n", dev, part);
+               bootstage_error(BOOTSTAGE_ID_IDE_READ);
+               return 1;
+       }
+       bootstage_mark(BOOTSTAGE_ID_IDE_READ);
+
+#if defined(CONFIG_FIT)
+       /* This cannot be done earlier,
+        * we need complete FIT image in RAM first */
+       if (genimg_get_format((void *) addr) == IMAGE_FORMAT_FIT) {
+               if (!fit_check_format(fit_hdr)) {
+                       bootstage_error(BOOTSTAGE_ID_IDE_FIT_READ);
+                       puts("** Bad FIT image format\n");
+                       return 1;
+               }
+               bootstage_mark(BOOTSTAGE_ID_IDE_FIT_READ_OK);
+               fit_print_contents(fit_hdr);
+       }
+#endif
+
+       flush_cache(addr, (cnt+1)*info.blksz);
+
+       /* Loading ok, update default load address */
+       load_addr = addr;
+
+       return bootm_maybe_autostart(cmdtp, argv[0]);
+}
index f5b6c7b1ec6fb760dc35c55a4f966171941d063a..6e1e5680a2cb94154c34082f263e2fe7f3a58b47 100644 (file)
@@ -334,156 +334,7 @@ int do_ide(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 
 int do_diskboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 {
-       char *boot_device = NULL;
-       char *ep;
-       int dev, part = 0;
-       ulong addr, cnt;
-       disk_partition_t info;
-       image_header_t *hdr;
-
-#if defined(CONFIG_FIT)
-       const void *fit_hdr = NULL;
-#endif
-
-       bootstage_mark(BOOTSTAGE_ID_IDE_START);
-       switch (argc) {
-       case 1:
-               addr = CONFIG_SYS_LOAD_ADDR;
-               boot_device = getenv("bootdevice");
-               break;
-       case 2:
-               addr = simple_strtoul(argv[1], NULL, 16);
-               boot_device = getenv("bootdevice");
-               break;
-       case 3:
-               addr = simple_strtoul(argv[1], NULL, 16);
-               boot_device = argv[2];
-               break;
-       default:
-               bootstage_error(BOOTSTAGE_ID_IDE_ADDR);
-               return CMD_RET_USAGE;
-       }
-       bootstage_mark(BOOTSTAGE_ID_IDE_ADDR);
-
-       if (!boot_device) {
-               puts("\n** No boot device **\n");
-               bootstage_error(BOOTSTAGE_ID_IDE_BOOT_DEVICE);
-               return 1;
-       }
-       bootstage_mark(BOOTSTAGE_ID_IDE_BOOT_DEVICE);
-
-       dev = simple_strtoul(boot_device, &ep, 16);
-
-       if (ide_dev_desc[dev].type == DEV_TYPE_UNKNOWN) {
-               printf("\n** Device %d not available\n", dev);
-               bootstage_error(BOOTSTAGE_ID_IDE_TYPE);
-               return 1;
-       }
-       bootstage_mark(BOOTSTAGE_ID_IDE_TYPE);
-
-       if (*ep) {
-               if (*ep != ':') {
-                       puts("\n** Invalid boot device, use `dev[:part]' **\n");
-                       bootstage_error(BOOTSTAGE_ID_IDE_PART);
-                       return 1;
-               }
-               part = simple_strtoul(++ep, NULL, 16);
-       }
-       bootstage_mark(BOOTSTAGE_ID_IDE_PART);
-
-       if (get_partition_info(&ide_dev_desc[dev], part, &info)) {
-               bootstage_error(BOOTSTAGE_ID_IDE_PART_INFO);
-               return 1;
-       }
-       bootstage_mark(BOOTSTAGE_ID_IDE_PART_INFO);
-
-       if ((strncmp((char *)info.type, BOOT_PART_TYPE, sizeof(info.type)) != 0)
-           &&
-           (strncmp((char *)info.type, BOOT_PART_COMP, sizeof(info.type)) != 0)
-          ) {
-               printf("\n** Invalid partition type \"%.32s\"" " (expect \""
-                       BOOT_PART_TYPE "\")\n",
-                       info.type);
-               bootstage_error(BOOTSTAGE_ID_IDE_PART_TYPE);
-               return 1;
-       }
-       bootstage_mark(BOOTSTAGE_ID_IDE_PART_TYPE);
-
-       printf("\nLoading from IDE device %d, partition %d: "
-              "Name: %.32s  Type: %.32s\n", dev, part, info.name, info.type);
-
-       debug("First Block: %ld,  # of blocks: %ld, Block Size: %ld\n",
-             info.start, info.size, info.blksz);
-
-       if (ide_dev_desc[dev].
-           block_read(dev, info.start, 1, (ulong *) addr) != 1) {
-               printf("** Read error on %d:%d\n", dev, part);
-               bootstage_error(BOOTSTAGE_ID_IDE_PART_READ);
-               return 1;
-       }
-       bootstage_mark(BOOTSTAGE_ID_IDE_PART_READ);
-
-       switch (genimg_get_format((void *) addr)) {
-       case IMAGE_FORMAT_LEGACY:
-               hdr = (image_header_t *) addr;
-
-               bootstage_mark(BOOTSTAGE_ID_IDE_FORMAT);
-
-               if (!image_check_hcrc(hdr)) {
-                       puts("\n** Bad Header Checksum **\n");
-                       bootstage_error(BOOTSTAGE_ID_IDE_CHECKSUM);
-                       return 1;
-               }
-               bootstage_mark(BOOTSTAGE_ID_IDE_CHECKSUM);
-
-               image_print_contents(hdr);
-
-               cnt = image_get_image_size(hdr);
-               break;
-#if defined(CONFIG_FIT)
-       case IMAGE_FORMAT_FIT:
-               fit_hdr = (const void *) addr;
-               puts("Fit image detected...\n");
-
-               cnt = fit_get_size(fit_hdr);
-               break;
-#endif
-       default:
-               bootstage_error(BOOTSTAGE_ID_IDE_FORMAT);
-               puts("** Unknown image type\n");
-               return 1;
-       }
-
-       cnt += info.blksz - 1;
-       cnt /= info.blksz;
-       cnt -= 1;
-
-       if (ide_dev_desc[dev].block_read(dev, info.start + 1, cnt,
-                                        (ulong *)(addr + info.blksz)) != cnt) {
-               printf("** Read error on %d:%d\n", dev, part);
-               bootstage_error(BOOTSTAGE_ID_IDE_READ);
-               return 1;
-       }
-       bootstage_mark(BOOTSTAGE_ID_IDE_READ);
-
-#if defined(CONFIG_FIT)
-       /* This cannot be done earlier, we need complete FIT image in RAM first */
-       if (genimg_get_format((void *) addr) == IMAGE_FORMAT_FIT) {
-               if (!fit_check_format(fit_hdr)) {
-                       bootstage_error(BOOTSTAGE_ID_IDE_FIT_READ);
-                       puts("** Bad FIT image format\n");
-                       return 1;
-               }
-               bootstage_mark(BOOTSTAGE_ID_IDE_FIT_READ_OK);
-               fit_print_contents(fit_hdr);
-       }
-#endif
-
-       /* Loading ok, update default load address */
-
-       load_addr = addr;
-
-       return bootm_maybe_autostart(cmdtp, argv[0]);
+       return common_diskboot(cmdtp, "ide", argc, argv);
 }
 
 /* ------------------------------------------------------------------------- */
index d15b567dbb2411225c99b77eef0108f6a2e638b1..22d0119814fbf491600728a074dc9bf947dbace8 100644 (file)
@@ -206,128 +206,7 @@ block_dev_desc_t * scsi_get_dev(int dev)
  */
 int do_scsiboot (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-       char *boot_device = NULL;
-       char *ep;
-       int dev, part = 0;
-       ulong addr, cnt;
-       disk_partition_t info;
-       image_header_t *hdr;
-#if defined(CONFIG_FIT)
-       const void *fit_hdr = NULL;
-#endif
-
-       switch (argc) {
-       case 1:
-               addr = CONFIG_SYS_LOAD_ADDR;
-               boot_device = getenv ("bootdevice");
-               break;
-       case 2:
-               addr = simple_strtoul(argv[1], NULL, 16);
-               boot_device = getenv ("bootdevice");
-               break;
-       case 3:
-               addr = simple_strtoul(argv[1], NULL, 16);
-               boot_device = argv[2];
-               break;
-       default:
-               return CMD_RET_USAGE;
-       }
-
-       if (!boot_device) {
-               puts ("\n** No boot device **\n");
-               return 1;
-       }
-
-       dev = simple_strtoul(boot_device, &ep, 16);
-       printf("booting from dev %d\n",dev);
-       if (scsi_dev_desc[dev].type == DEV_TYPE_UNKNOWN) {
-               printf ("\n** Device %d not available\n", dev);
-               return 1;
-       }
-
-       if (*ep) {
-               if (*ep != ':') {
-                       puts ("\n** Invalid boot device, use `dev[:part]' **\n");
-                       return 1;
-               }
-               part = simple_strtoul(++ep, NULL, 16);
-       }
-       if (get_partition_info (&scsi_dev_desc[dev], part, &info)) {
-               printf("error reading partinfo\n");
-               return 1;
-       }
-       if ((strncmp((char *)(info.type), BOOT_PART_TYPE, sizeof(info.type)) != 0) &&
-           (strncmp((char *)(info.type), BOOT_PART_COMP, sizeof(info.type)) != 0)) {
-               printf ("\n** Invalid partition type \"%.32s\""
-                       " (expect \"" BOOT_PART_TYPE "\")\n",
-                       info.type);
-               return 1;
-       }
-
-       printf ("\nLoading from SCSI device %d, partition %d: "
-               "Name: %.32s  Type: %.32s\n",
-               dev, part, info.name, info.type);
-
-       debug ("First Block: %ld,  # of blocks: %ld, Block Size: %ld\n",
-               info.start, info.size, info.blksz);
-
-       if (scsi_read (dev, info.start, 1, (ulong *)addr) != 1) {
-               printf ("** Read error on %d:%d\n", dev, part);
-               return 1;
-       }
-
-       switch (genimg_get_format ((void *)addr)) {
-       case IMAGE_FORMAT_LEGACY:
-               hdr = (image_header_t *)addr;
-
-               if (!image_check_hcrc (hdr)) {
-                       puts ("\n** Bad Header Checksum **\n");
-                       return 1;
-               }
-
-               image_print_contents (hdr);
-               cnt = image_get_image_size (hdr);
-               break;
-#if defined(CONFIG_FIT)
-       case IMAGE_FORMAT_FIT:
-               fit_hdr = (const void *)addr;
-               puts ("Fit image detected...\n");
-
-               cnt = fit_get_size (fit_hdr);
-               break;
-#endif
-       default:
-               puts ("** Unknown image type\n");
-               return 1;
-       }
-
-       cnt += info.blksz - 1;
-       cnt /= info.blksz;
-       cnt -= 1;
-
-       if (scsi_read (dev, info.start+1, cnt,
-                     (ulong *)(addr+info.blksz)) != cnt) {
-               printf ("** Read error on %d:%d\n", dev, part);
-               return 1;
-       }
-
-#if defined(CONFIG_FIT)
-       /* This cannot be done earlier, we need complete FIT image in RAM first */
-       if (genimg_get_format ((void *)addr) == IMAGE_FORMAT_FIT) {
-               if (!fit_check_format (fit_hdr)) {
-                       puts ("** Bad FIT image format\n");
-                       return 1;
-               }
-               fit_print_contents (fit_hdr);
-       }
-#endif
-
-       /* Loading ok, update default load address */
-       load_addr = addr;
-
-       flush_cache (addr, (cnt+1)*info.blksz);
-
-       return bootm_maybe_autostart(cmdtp, argv[0]);
+       return common_diskboot(cmdtp, "scsi", argc, argv);
 }
 
 /*********************************************************************************
index a8e3ae5b67f8b00e6a2a83fd40c65fdc28fcd9b7..181e727f00a6196b8eb9c9e0605a79f847f3cb0e 100644 (file)
@@ -355,143 +355,7 @@ void usb_show_tree(struct usb_device *dev)
 #ifdef CONFIG_USB_STORAGE
 int do_usbboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-       char *boot_device = NULL;
-       char *ep;
-       int dev, part = 1;
-       ulong addr, cnt;
-       disk_partition_t info;
-       image_header_t *hdr;
-       block_dev_desc_t *stor_dev;
-#if defined(CONFIG_FIT)
-       const void *fit_hdr = NULL;
-#endif
-
-       switch (argc) {
-       case 1:
-               addr = CONFIG_SYS_LOAD_ADDR;
-               boot_device = getenv("bootdevice");
-               break;
-       case 2:
-               addr = simple_strtoul(argv[1], NULL, 16);
-               boot_device = getenv("bootdevice");
-               break;
-       case 3:
-               addr = simple_strtoul(argv[1], NULL, 16);
-               boot_device = argv[2];
-               break;
-       default:
-               return CMD_RET_USAGE;
-       }
-
-       if (!boot_device) {
-               puts("\n** No boot device **\n");
-               return 1;
-       }
-
-       dev = simple_strtoul(boot_device, &ep, 16);
-       stor_dev = usb_stor_get_dev(dev);
-       if (stor_dev == NULL || stor_dev->type == DEV_TYPE_UNKNOWN) {
-               printf("\n** Device %d not available\n", dev);
-               return 1;
-       }
-       if (stor_dev->block_read == NULL) {
-               printf("storage device not initialized. Use usb scan\n");
-               return 1;
-       }
-       if (*ep) {
-               if (*ep != ':') {
-                       puts("\n** Invalid boot device, use `dev[:part]' **\n");
-                       return 1;
-               }
-               part = simple_strtoul(++ep, NULL, 16);
-       }
-
-       if (get_partition_info(stor_dev, part, &info)) {
-               /* try to boot raw .... */
-               strncpy((char *)&info.type[0], BOOT_PART_TYPE,
-                       sizeof(BOOT_PART_TYPE));
-               strncpy((char *)&info.name[0], "Raw", 4);
-               info.start = 0;
-               info.blksz = 0x200;
-               info.size = 2880;
-               printf("error reading partinfo...try to boot raw\n");
-       }
-       if ((strncmp((char *)info.type, BOOT_PART_TYPE,
-           sizeof(info.type)) != 0) &&
-           (strncmp((char *)info.type, BOOT_PART_COMP,
-           sizeof(info.type)) != 0)) {
-               printf("\n** Invalid partition type \"%.32s\""
-                       " (expect \"" BOOT_PART_TYPE "\")\n",
-                       info.type);
-               return 1;
-       }
-       printf("\nLoading from USB device %d, partition %d: "
-               "Name: %.32s  Type: %.32s\n",
-               dev, part, info.name, info.type);
-
-       debug("First Block: %ld,  # of blocks: %ld, Block Size: %ld\n",
-               info.start, info.size, info.blksz);
-
-       if (stor_dev->block_read(dev, info.start, 1, (ulong *)addr) != 1) {
-               printf("** Read error on %d:%d\n", dev, part);
-               return 1;
-       }
-
-       switch (genimg_get_format((void *)addr)) {
-       case IMAGE_FORMAT_LEGACY:
-               hdr = (image_header_t *)addr;
-
-               if (!image_check_hcrc(hdr)) {
-                       puts("\n** Bad Header Checksum **\n");
-                       return 1;
-               }
-
-               image_print_contents(hdr);
-
-               cnt = image_get_image_size(hdr);
-               break;
-#if defined(CONFIG_FIT)
-       case IMAGE_FORMAT_FIT:
-               fit_hdr = (const void *)addr;
-               puts("Fit image detected...\n");
-
-               cnt = fit_get_size(fit_hdr);
-               break;
-#endif
-       default:
-               puts("** Unknown image type\n");
-               return 1;
-       }
-
-       cnt += info.blksz - 1;
-       cnt /= info.blksz;
-       cnt -= 1;
-
-       if (stor_dev->block_read(dev, info.start+1, cnt,
-                     (ulong *)(addr+info.blksz)) != cnt) {
-               printf("\n** Read error on %d:%d\n", dev, part);
-               return 1;
-       }
-
-#if defined(CONFIG_FIT)
-       /* This cannot be done earlier, we need complete FIT image in RAM
-        * first
-        */
-       if (genimg_get_format((void *)addr) == IMAGE_FORMAT_FIT) {
-               if (!fit_check_format(fit_hdr)) {
-                       puts("** Bad FIT image format\n");
-                       return 1;
-               }
-               fit_print_contents(fit_hdr);
-       }
-#endif
-
-       /* Loading ok, update default load address */
-       load_addr = addr;
-
-       flush_cache(addr, (cnt+1)*info.blksz);
-
-       return bootm_maybe_autostart(cmdtp, argv[0]);
+       return common_diskboot(cmdtp, "usb", argc, argv);
 }
 #endif /* CONFIG_USB_STORAGE */
 
index 6e1bdc2ab27479dc61b2e4f1e020b524eaa40792..1f06aa1819023c0869b5c30ddeff4fe949becf19 100644 (file)
@@ -110,6 +110,10 @@ static inline int bootm_maybe_autostart(cmd_tbl_t *cmdtp, const char *cmd)
        return 0;
 }
 #endif
+
+extern int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc,
+                          char *const argv[]);
+
 extern int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
 
 /*