doc: relocate/rename Android README and add BCB overview

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

diff --git a/common/spl/spl_usb.c b/common/spl/spl_usb.c
index aaa4f8103fa430474a05514ef726b0a9bbe40851..e29d579b0d43ff77c0eba8bd4987cd5a69a928de 100644 (file)
--- a/common/spl/spl_usb.c
+++ b/common/spl/spl_usb.c
@@ -1,11 +1,10 @@
+// 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
  */
 
@@ -16,11 +15,7 @@
 #include <usb.h>
 #include <fat.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
-#ifdef CONFIG_USB_STORAGE
 static int usb_stor_curr_dev = -1; /* current device */
-#endif
 
 static int spl_usb_load_image(struct spl_image_info *spl_image,
                              struct spl_boot_device *bootdev)
@@ -37,23 +32,24 @@ static int spl_usb_load_image(struct spl_image_info *spl_image,
                return err;
        }
 
-#ifdef CONFIG_USB_STORAGE
        /* try to recognize storage devices immediately */
        usb_stor_curr_dev = usb_stor_scan(1);
        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_FS_LOAD_PAYLOAD_NAME);
+       {
+               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");
@@ -62,4 +58,4 @@ static int spl_usb_load_image(struct spl_image_info *spl_image,
 
        return 0;
 }
-SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_USB, spl_usb_load_image);
+SPL_LOAD_IMAGE_METHOD("USB", 0, BOOT_DEVICE_USB, spl_usb_load_image);