mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2025-09-14 18:31:27 +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>
92 lines
2.3 KiB
C
92 lines
2.3 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* (C) Copyright 2013
|
|
* Texas Instruments, <www.ti.com>
|
|
*
|
|
* Dan Murphy <dmurphy@ti.com>
|
|
*
|
|
* Derived work from spl_usb.c
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <spl.h>
|
|
#include <asm/u-boot.h>
|
|
#include <sata.h>
|
|
#include <scsi.h>
|
|
#include <errno.h>
|
|
#include <fat.h>
|
|
#include <image.h>
|
|
|
|
static int spl_sata_load_image_raw(struct spl_image_info *spl_image,
|
|
struct spl_boot_device *bootdev,
|
|
struct blk_desc *stor_dev, unsigned long sector)
|
|
{
|
|
struct legacy_img_hdr *header;
|
|
unsigned long count;
|
|
u32 image_size_sectors;
|
|
u32 image_offset_sectors;
|
|
u32 image_offset;
|
|
int ret;
|
|
|
|
header = spl_get_load_buffer(-sizeof(*header), stor_dev->blksz);
|
|
count = blk_dread(stor_dev, sector, 1, header);
|
|
if (count == 0)
|
|
return -EIO;
|
|
|
|
ret = spl_parse_image_header(spl_image, bootdev, header);
|
|
if (ret)
|
|
return ret;
|
|
|
|
image_size_sectors = DIV_ROUND_UP(spl_image->size, stor_dev->blksz);
|
|
image_offset_sectors = spl_image->offset / stor_dev->blksz;
|
|
image_offset = spl_image->offset % stor_dev->blksz;
|
|
count = blk_dread(stor_dev, sector + image_offset_sectors,
|
|
image_size_sectors,
|
|
(void *)spl_image->load_addr);
|
|
if (count != image_size_sectors)
|
|
return -EIO;
|
|
|
|
if (image_offset)
|
|
memmove((void *)spl_image->load_addr,
|
|
(void *)spl_image->load_addr + image_offset,
|
|
spl_image->size);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int spl_sata_load_image(struct spl_image_info *spl_image,
|
|
struct spl_boot_device *bootdev)
|
|
{
|
|
int err = -ENOSYS;
|
|
struct blk_desc *stor_dev;
|
|
|
|
/* try to recognize storage devices immediately */
|
|
scsi_scan(false);
|
|
stor_dev = blk_get_devnum_by_uclass_id(UCLASS_SCSI, 0);
|
|
if (!stor_dev)
|
|
return -ENODEV;
|
|
|
|
#if CONFIG_IS_ENABLED(OS_BOOT)
|
|
if (spl_start_uboot() ||
|
|
spl_load_image_fat_os(spl_image, bootdev, stor_dev,
|
|
CONFIG_SYS_SATA_FAT_BOOT_PARTITION))
|
|
#endif
|
|
{
|
|
#ifdef CONFIG_SPL_FS_FAT
|
|
err = spl_load_image_fat(spl_image, bootdev, stor_dev,
|
|
CONFIG_SYS_SATA_FAT_BOOT_PARTITION,
|
|
CONFIG_SPL_FS_LOAD_PAYLOAD_NAME);
|
|
#elif defined(CONFIG_SPL_SATA_RAW_U_BOOT_USE_SECTOR)
|
|
err = spl_sata_load_image_raw(spl_image, bootdev, stor_dev,
|
|
CONFIG_SPL_SATA_RAW_U_BOOT_SECTOR);
|
|
#endif
|
|
}
|
|
if (err) {
|
|
puts("Error loading sata device\n");
|
|
return err;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
SPL_LOAD_IMAGE_METHOD("SATA", 0, BOOT_DEVICE_SATA, spl_sata_load_image);
|