mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-12 16:07:30 +00:00
5fce287556
Some image types (e.g. kwbimage v1) store the offset to SPL binary and offset to U-Boot proper binary in their headers. To avoid reading SPL binary when loading U-Boot proper, add support for specifying offset in struct spl_image_info, which defines the offset from the beginning of the header and the beginning of the executable data. Initial support is added only for SPI, MMC and SATA code. We can extend it later if needed. Signed-off-by: Pali Rohár <pali@kernel.org> Reviewed-by: Marek Behún <marek.behun@nic.cz> Reviewed-by: Stefan Roese <sr@denx.de>
115 lines
2.8 KiB
C
115 lines
2.8 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>
|
|
|
|
#ifndef CONFIG_SYS_SATA_FAT_BOOT_PARTITION
|
|
#define CONFIG_SYS_SATA_FAT_BOOT_PARTITION 1
|
|
#endif
|
|
|
|
#ifndef CONFIG_SPL_FS_LOAD_PAYLOAD_NAME
|
|
#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
|
|
#endif
|
|
|
|
#ifndef CONFIG_SPL_SATA_RAW_U_BOOT_SECTOR
|
|
/* Dummy value to make the compiler happy */
|
|
#define CONFIG_SPL_SATA_RAW_U_BOOT_SECTOR 0x100
|
|
#endif
|
|
|
|
static int spl_sata_load_image_raw(struct spl_image_info *spl_image,
|
|
struct blk_desc *stor_dev, unsigned long sector)
|
|
{
|
|
struct image_header *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, 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 = 0;
|
|
struct blk_desc *stor_dev;
|
|
|
|
#if !defined(CONFIG_DM_SCSI) && !defined(CONFIG_AHCI)
|
|
err = init_sata(CONFIG_SPL_SATA_BOOT_DEVICE);
|
|
#endif
|
|
if (err) {
|
|
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
|
|
printf("spl: sata init failed: err - %d\n", err);
|
|
#endif
|
|
return err;
|
|
} else {
|
|
/* try to recognize storage devices immediately */
|
|
scsi_scan(false);
|
|
stor_dev = blk_get_devnum_by_type(IF_TYPE_SCSI, 0);
|
|
if (!stor_dev)
|
|
return -ENODEV;
|
|
}
|
|
|
|
#ifdef CONFIG_SPL_OS_BOOT
|
|
if (spl_start_uboot() ||
|
|
spl_load_image_fat_os(spl_image, stor_dev,
|
|
CONFIG_SYS_SATA_FAT_BOOT_PARTITION))
|
|
#endif
|
|
{
|
|
err = -ENOSYS;
|
|
|
|
if (IS_ENABLED(CONFIG_SPL_FS_FAT)) {
|
|
err = spl_load_image_fat(spl_image, stor_dev,
|
|
CONFIG_SYS_SATA_FAT_BOOT_PARTITION,
|
|
CONFIG_SPL_FS_LOAD_PAYLOAD_NAME);
|
|
} else if (IS_ENABLED(CONFIG_SPL_SATA_RAW_U_BOOT_USE_SECTOR)) {
|
|
err = spl_sata_load_image_raw(spl_image, stor_dev,
|
|
CONFIG_SPL_SATA_RAW_U_BOOT_SECTOR);
|
|
}
|
|
}
|
|
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);
|