SPDX: Convert all of our single license tags to Linux Kernel style

[oweals/u-boot.git] / common / spl / spl_usb.c

diff --git a/common/spl/spl_usb.c b/common/spl/spl_usb.c
index 53a9043795f4288f30ff013c17a03db54850cf96..c8d82318957940ec7d97155fdd66acdde6aefab5 100644 (file)
--- a/common/spl/spl_usb.c
+++ b/common/spl/spl_usb.c
@@ -1,30 +1,29 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2014
  * Texas Instruments, <www.ti.com>
  *
  * Dan Murphy <dmurphy@ti.com>
  *
- * SPDX-License-Identifier:    GPL-2.0+
- *
  * Derived work from spl_mmc.c
  */
 
 #include <common.h>
 #include <spl.h>
 #include <asm/u-boot.h>
+#include <errno.h>
 #include <usb.h>
 #include <fat.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
 #ifdef CONFIG_USB_STORAGE
 static int usb_stor_curr_dev = -1; /* current device */
 #endif
 
-void spl_usb_load_image(void)
+static int spl_usb_load_image(struct spl_image_info *spl_image,
+                             struct spl_boot_device *bootdev)
 {
        int err;
-       block_dev_desc_t *stor_dev;
+       struct blk_desc *stor_dev;
 
        usb_stop();
        err = usb_init();
@@ -32,27 +31,35 @@ void spl_usb_load_image(void)
 #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
                printf("%s: usb init failed: err - %d\n", __func__, err);
 #endif
-               hang();
+               return err;
        }
 
 #ifdef CONFIG_USB_STORAGE
        /* try to recognize storage devices immediately */
        usb_stor_curr_dev = usb_stor_scan(1);
-       stor_dev = usb_stor_get_dev(usb_stor_curr_dev);
+       stor_dev = blk_get_devnum_by_type(IF_TYPE_USB, usb_stor_curr_dev);
+       if (!stor_dev)
+               return -ENODEV;
 #endif
 
        debug("boot mode - FAT\n");
 
 #ifdef CONFIG_SPL_OS_BOOT
-               if (spl_start_uboot() || spl_load_image_fat_os(stor_dev,
-                                                               CONFIG_SYS_USB_FAT_BOOT_PARTITION))
+       if (spl_start_uboot() ||
+           spl_load_image_fat_os(spl_image, stor_dev,
+                                 CONFIG_SYS_USB_FAT_BOOT_PARTITION))
 #endif
-               err = spl_load_image_fat(stor_dev,
-                               CONFIG_SYS_USB_FAT_BOOT_PARTITION,
-                               CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME);
-
-               if (err) {
-                       puts("Error loading USB device\n");
-                       hang();
-               }
+       {
+               err = spl_load_image_fat(spl_image, stor_dev,
+                                       CONFIG_SYS_USB_FAT_BOOT_PARTITION,
+                                       CONFIG_SPL_FS_LOAD_PAYLOAD_NAME);
+       }
+
+       if (err) {
+               puts("Error loading from USB device\n");
+               return err;
+       }
+
+       return 0;
 }
+SPL_LOAD_IMAGE_METHOD("USB", 0, BOOT_DEVICE_USB, spl_usb_load_image);