mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2025-09-09 16:01:51 +02:00
d678a59d2d
When bringing in the series 'arm: dts: am62-beagleplay: Fix Beagleplay Ethernet"' I failed to notice that b4 noticed it was based on next and so took that as the base commit and merged that part of next to master. This reverts commit c8ffd1356d42223cbb8c86280a083cc3c93e6426, reversing changes made to 2ee6f3a5f7550de3599faef9704e166e5dcace35. Reported-by: Jonas Karlman <jonas@kwiboo.se> Signed-off-by: Tom Rini <trini@konsulko.com>
74 lines
1.6 KiB
C
74 lines
1.6 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* (C) Copyright 2014
|
|
* Texas Instruments, <www.ti.com>
|
|
*
|
|
* Dan Murphy <dmurphy@ti.com>
|
|
*
|
|
* Derived work from spl_mmc.c
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <log.h>
|
|
#include <spl.h>
|
|
#include <asm/u-boot.h>
|
|
#include <errno.h>
|
|
#include <usb.h>
|
|
#include <fat.h>
|
|
|
|
static int usb_stor_curr_dev = -1; /* current device */
|
|
|
|
int spl_usb_load(struct spl_image_info *spl_image,
|
|
struct spl_boot_device *bootdev, int partition,
|
|
const char *filename)
|
|
{
|
|
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;
|
|
}
|
|
|
|
if (err) {
|
|
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
|
|
printf("%s: usb init failed: err - %d\n", __func__, err);
|
|
#endif
|
|
return err;
|
|
}
|
|
|
|
/* try to recognize storage devices immediately */
|
|
usb_stor_curr_dev = usb_stor_scan(1);
|
|
stor_dev = blk_get_devnum_by_uclass_id(UCLASS_USB, usb_stor_curr_dev);
|
|
if (!stor_dev)
|
|
return -ENODEV;
|
|
|
|
debug("boot mode - FAT\n");
|
|
|
|
#if CONFIG_IS_ENABLED(OS_BOOT)
|
|
if (spl_start_uboot() ||
|
|
spl_load_image_fat_os(spl_image, bootdev, stor_dev, partition))
|
|
#endif
|
|
{
|
|
err = spl_load_image_fat(spl_image, bootdev, stor_dev, partition, filename);
|
|
}
|
|
|
|
if (err) {
|
|
puts("Error loading from USB device\n");
|
|
return err;
|
|
}
|
|
|
|
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);
|