Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-25 06:00:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

spl: Convert fat to spl_load

Browse source 
This converts the fat loader to use spl_load. Some platforms are very
tight on space, so we take care to only include the code we really need.

Signed-off-by: Sean Anderson <seanga2@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Sean Anderson 2023-11-08 11:48:49 -05:00 committed by Tom Rini
parent b8ed722567
commit 682184e9b9
3 changed files with 20 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
common/spl/spl_fat.c
View file

@ -11,8 +11,8 @@
#include <common.h>
#include <env.h>
#include <log.h>
#include <mapmem.h>
#include <spl.h>
#include <spl_load.h>
#include <asm/u-boot.h>
#include <fat.h>
#include <errno.h>
@ -66,58 +66,38 @@ int spl_load_image_fat(struct spl_image_info *spl_image,
const char *filename)
{
int err;
struct legacy_img_hdr *header;
loff_t size;
struct spl_load_info load;
err = spl_register_fat_device(block_dev, partition);
if (err)
goto end;
header = spl_get_load_buffer(-sizeof(*header), sizeof(*header));
err = file_fat_read(filename, header, sizeof(struct legacy_img_hdr));
if (err <= 0)
goto end;
if (IS_ENABLED(CONFIG_SPL_LOAD_FIT_FULL) &&
image_get_magic(header) == FDT_MAGIC) {
err = file_fat_read(filename,
map_sysmem(CONFIG_SYS_LOAD_ADDR, 0), 0);
if (err <= 0)
goto end;
err = spl_parse_image_header(spl_image, bootdev,
map_sysmem(CONFIG_SYS_LOAD_ADDR,
err));
if (err == -EAGAIN)
return err;
if (err == 0)
err = 1;
} else if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
image_get_magic(header) == FDT_MAGIC) {
struct spl_load_info load;
debug("Found FIT\n");
load.read = spl_fit_read;
spl_set_bl_len(&load, ARCH_DMA_MINALIGN);
load.priv = (void *)filename;
return spl_load_simple_fit(spl_image, &load, 0, header);
} else {
err = spl_parse_image_header(spl_image, bootdev, header);
/*
* Avoid pulling in this function for other image types since we are
* very short on space on some boards.
*/
if (IS_ENABLED(CONFIG_SPL_LOAD_FIT_FULL)) {
err = fat_size(filename, &size);
if (err)
goto end;
err = file_fat_read(filename, map_sysmem(spl_image->load_addr,
spl_image->size), 0);
} else {
size = 0;
}
load.read = spl_fit_read;
spl_set_bl_len(&load, ARCH_DMA_MINALIGN);
load.priv = (void *)filename;
err = spl_load(spl_image, bootdev, &load, size, 0);
end:
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
if (err <= 0)
if (err < 0)
printf("%s: error reading image %s, err - %d\n",
__func__, filename, err);
#endif
return (err <= 0);
return err;
}
#if CONFIG_IS_ENABLED(OS_BOOT)

1
include/spl_load.h
View file

@ -96,6 +96,7 @@ static inline int _spl_load(struct spl_image_info *spl_image,
*/
#define SPL_LOAD_USERS \
IS_ENABLED(CONFIG_SPL_FS_EXT4) + \
IS_ENABLED(CONFIG_SPL_FS_FAT) + \
0
#if SPL_LOAD_USERS > 1

3
test/image/spl_load_fs.c
View file

@ -425,8 +425,7 @@ static int spl_test_mmc(struct unit_test_state *uts, const char *test_name,
if (spl_test_mmc_fs(uts, test_name, type, create_ext2, false))
return CMD_RET_FAILURE;
if (type != IMX8 && type != LEGACY_LZMA &&
spl_test_mmc_fs(uts, test_name, type, create_fat, false))
if (spl_test_mmc_fs(uts, test_name, type, create_fat, false))
return CMD_RET_FAILURE;
if (type == LEGACY_LZMA)