Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-17 02:15:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

spl: Convert semihosting to spl_load

Browse source 
This converts the semihosting load method to use spl_load. As a result, it
also adds support for LOAD_FIT_FULL and IMX images.

Signed-off-by: Sean Anderson <seanga2@gmail.com>
This commit is contained in:
Sean Anderson 2023-11-08 11:48:55 -05:00 • committed by Tom Rini
parent 6029a0e1af
commit 9b9c6aaaf2
2 changed files with 7 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
common/spl/spl_semihosting.c
View file

@ -8,18 +8,7 @@
#include <log.h>
#include <semihosting.h>
#include <spl.h>
static int smh_read_full(long fd, void *memp, size_t len)
{
long read;
read = smh_read(fd, memp, len);
if (read < 0)
return read;
if (read != len)
return -EIO;
return 0;
}
#include <spl_load.h>
static ulong smh_fit_read(struct spl_load_info *load, ulong file_offset,
ulong size, void *buf)
@ -40,8 +29,7 @@ static int spl_smh_load_image(struct spl_image_info *spl_image,
const char *filename = CONFIG_SPL_FS_LOAD_PAYLOAD_NAME;
int ret;
long fd, len;
struct legacy_img_hdr *header =
spl_get_load_buffer(-sizeof(*header), sizeof(*header));
struct spl_load_info load;
fd = smh_open(filename, MODE_READ | MODE_BINARY);
if (fd < 0) {
@ -56,38 +44,10 @@ static int spl_smh_load_image(struct spl_image_info *spl_image,
}
len = ret;
ret = smh_read_full(fd, header, sizeof(struct legacy_img_hdr));
if (ret) {
log_debug("could not read image header: %d\n", ret);
goto out;
}
if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
image_get_magic(header) == FDT_MAGIC) {
struct spl_load_info load;
debug("Found FIT\n");
load.read = smh_fit_read;
spl_set_bl_len(&load, 1);
load.priv = &fd;
ret = spl_load_simple_fit(spl_image, &load, 0, header);
goto out;
}
ret = spl_parse_image_header(spl_image, bootdev, header);
if (ret) {
log_debug("failed to parse image header: %d\n", ret);
goto out;
}
ret = smh_seek(fd, 0);
if (ret) {
log_debug("could not seek to start of image: %d\n", ret);
goto out;
}
ret = smh_read_full(fd, (void *)spl_image->load_addr, len);
load.read = smh_fit_read;
spl_set_bl_len(&load, 1);
load.priv = &fd;
ret = spl_load(spl_image, bootdev, &load, len, 0);
if (ret)
log_debug("could not read %s: %d\n", filename, ret);
out:

1
include/spl_load.h
View file

@ -102,6 +102,7 @@ static inline int _spl_load(struct spl_image_info *spl_image,
(IS_ENABLED(CONFIG_SPL_NAND_SUPPORT) && !IS_ENABLED(CONFIG_SPL_UBI)) + \
IS_ENABLED(CONFIG_SPL_NET) + \
IS_ENABLED(CONFIG_SPL_NOR_SUPPORT) + \
IS_ENABLED(CONFIG_SPL_SEMIHOSTING) + \
0
#if SPL_LOAD_USERS > 1