combine block device load commands into common function

[people/ms/u-boot.git] / common / cmd_usb.c

diff --git a/common/cmd_usb.c b/common/cmd_usb.c
index a8e3ae5b67f8b00e6a2a83fd40c65fdc28fcd9b7..181e727f00a6196b8eb9c9e0605a79f847f3cb0e 100644 (file)
--- a/common/cmd_usb.c
+++ b/common/cmd_usb.c
@@ -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 */