leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spl: Update fat functions to take an spl_image parameter

Browse Source 
Update the fat loader to avoid using the spl_image global variable.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Simon Glass 2016-09-24 18:20:15 -06:00 committed by Tom Rini
parent b4a6c2aae6
commit 710e9ca579
5 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common/spl/spl_fat.c
View File

@ -54,9 +54,9 @@ static ulong spl_fit_read(struct spl_load_info *load, ulong file_offset,
return actread;
}
int spl_load_image_fat(struct blk_desc *block_dev,
int partition,
const char *filename)
int spl_load_image_fat(struct spl_image_info *spl_image,
struct blk_desc *block_dev, int partition,
const char *filename)
{
int err;
struct image_header *header;
@ -84,12 +84,12 @@ int spl_load_image_fat(struct blk_desc *block_dev,
return spl_load_simple_fit(&load, 0, header);
} else {
err = spl_parse_image_header(&spl_image, header);
err = spl_parse_image_header(spl_image, header);
if (err)
goto end;
err = file_fat_read(filename,
(u8 *)(uintptr_t)spl_image.load_addr, 0);
(u8 *)(uintptr_t)spl_image->load_addr, 0);
}
end:
@ -103,7 +103,8 @@ end:
}
#ifdef CONFIG_SPL_OS_BOOT
int spl_load_image_fat_os(struct blk_desc *block_dev, int partition)
int spl_load_image_fat_os(struct spl_image_info *spl_image,
struct blk_desc *block_dev, int partition)
{
int err;
__maybe_unused char *file;
@ -123,7 +124,8 @@ int spl_load_image_fat_os(struct blk_desc *block_dev, int partition)
}
file = getenv("falcon_image_file");
if (file) {
err = spl_load_image_fat(block_dev, partition, file);
err = spl_load_image_fat(spl_image, block_dev,
partition, file);
if (err != 0) {
puts("spl: falling back to default\n");
goto defaults;
@ -148,11 +150,12 @@ defaults:
return -1;
}
return spl_load_image_fat(block_dev, partition,
return spl_load_image_fat(spl_image, block_dev, partition,
CONFIG_SPL_FS_LOAD_KERNEL_NAME);
}
#else
int spl_load_image_fat_os(struct blk_desc *block_dev, int partition)
int spl_load_image_fat_os(struct spl_image_info *spl_image,
struct blk_desc *block_dev, int partition)
{
return -ENOSYS;
}

4
common/spl/spl_mmc.c
View File

@ -230,13 +230,13 @@ static int spl_mmc_do_fs_boot(struct spl_image_info *spl_image, struct mmc *mmc)
#ifdef CONFIG_SPL_FAT_SUPPORT
if (!spl_start_uboot()) {
err = spl_load_image_fat_os(mmc_get_blk_desc(mmc),
err = spl_load_image_fat_os(spl_image, mmc_get_blk_desc(mmc),
CONFIG_SYS_MMCSD_FS_BOOT_PARTITION);
if (!err)
return err;
}
#ifdef CONFIG_SPL_FS_LOAD_PAYLOAD_NAME
err = spl_load_image_fat(mmc_get_blk_desc(mmc),
err = spl_load_image_fat(spl_image, mmc_get_blk_desc(mmc),
CONFIG_SYS_MMCSD_FS_BOOT_PARTITION,
CONFIG_SPL_FS_LOAD_PAYLOAD_NAME);
if (!err)

11
common/spl/spl_sata.c
View File

@ -41,12 +41,15 @@ static int spl_sata_load_image(struct spl_image_info *spl_image,
}
#ifdef CONFIG_SPL_OS_BOOT
if (spl_start_uboot() || spl_load_image_fat_os(stor_dev,
CONFIG_SYS_SATA_FAT_BOOT_PARTITION))
if (spl_start_uboot() ||
spl_load_image_fat_os(spl_image, stor_dev,
CONFIG_SYS_SATA_FAT_BOOT_PARTITION))
#endif
err = spl_load_image_fat(stor_dev,
CONFIG_SYS_SATA_FAT_BOOT_PARTITION,
{
err = spl_load_image_fat(spl_image, stor_dev,
CONFIG_SYS_SATA_FAT_BOOT_PARTITION,
CONFIG_SPL_FS_LOAD_PAYLOAD_NAME);
}
if (err) {
puts("Error loading sata device\n");
return err;

13
common/spl/spl_usb.c
View File

@ -48,12 +48,15 @@ static int spl_usb_load_image(struct spl_image_info *spl_image,
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");

6
include/spl.h
View File

@ -184,9 +184,11 @@ struct spl_image_loader {
}
/* SPL FAT image functions */
int spl_load_image_fat(struct blk_desc *block_dev, int partition,
int spl_load_image_fat(struct spl_image_info *spl_image,
struct blk_desc *block_dev, int partition,
const char *filename);
int spl_load_image_fat_os(struct blk_desc *block_dev, int partition);
int spl_load_image_fat_os(struct spl_image_info *spl_image,
struct blk_desc *block_dev, int partition);
void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image);