diff options
| author | Tom Rini <trini@konsulko.com> | 2020-08-11 23:03:46 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-08-11 23:03:46 -0400 |
| commit | c25344ff9ae1d764a8e85296736d6e150e34b4fd (patch) | |
| tree | 3fa53ec91a805d19b4c4ab7a30f60d2bba2d5554 /common/spl/spl_usb.c | |
| parent | b298720900752967dd46a5b54a5a303eb11eed95 (diff) | |
| parent | db6451ec0e8483f76f3364293d48e86249c52322 (diff) | |
Merge tag 'ti-v2020.10-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti
- Added support for J7200 evm
- DM_ETH and DM_USB migrations for omap3
- USB DFU and mass storage support for AM65x evm
- RTI watchdog support for K3 devices
- Fix an issue with L3 cache on K3 devices
Diffstat (limited to 'common/spl/spl_usb.c')
| -rw-r--r-- | common/spl/spl_usb.c | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/common/spl/spl_usb.c b/common/spl/spl_usb.c index 08837b38fc9..3648de34927 100644 --- a/common/spl/spl_usb.c +++ b/common/spl/spl_usb.c @@ -18,14 +18,20 @@ static int usb_stor_curr_dev = -1; /* current device */ -static int spl_usb_load_image(struct spl_image_info *spl_image, - struct spl_boot_device *bootdev) +int spl_usb_load(struct spl_image_info *spl_image, + struct spl_boot_device *bootdev, int partition, + const char *filename) { - int err; + int err = 0; struct blk_desc *stor_dev; + static bool usb_init_pending = true; + + if (usb_init_pending) { + usb_stop(); + err = usb_init(); + usb_init_pending = false; + } - usb_stop(); - err = usb_init(); if (err) { #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("%s: usb init failed: err - %d\n", __func__, err); @@ -43,13 +49,10 @@ static int spl_usb_load_image(struct spl_image_info *spl_image, #ifdef CONFIG_SPL_OS_BOOT if (spl_start_uboot() || - spl_load_image_fat_os(spl_image, stor_dev, - CONFIG_SYS_USB_FAT_BOOT_PARTITION)) + spl_load_image_fat_os(spl_image, stor_dev, partition)) #endif { - err = spl_load_image_fat(spl_image, stor_dev, - CONFIG_SYS_USB_FAT_BOOT_PARTITION, - CONFIG_SPL_FS_LOAD_PAYLOAD_NAME); + err = spl_load_image_fat(spl_image, stor_dev, partition, filename); } if (err) { @@ -59,4 +62,12 @@ static int spl_usb_load_image(struct spl_image_info *spl_image, return 0; } + +static int spl_usb_load_image(struct spl_image_info *spl_image, + struct spl_boot_device *bootdev) +{ + return spl_usb_load(spl_image, bootdev, + CONFIG_SYS_USB_FAT_BOOT_PARTITION, + CONFIG_SPL_FS_LOAD_PAYLOAD_NAME); +} SPL_LOAD_IMAGE_METHOD("USB", 0, BOOT_DEVICE_USB, spl_usb_load_image); |