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

sandbox: Add an SPL loader for UPL

Browse source 
Add support for loading a UPL image from SPL. This uses the simple FIT
implementation, but also loads the full FIT just to permit more testing.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2024-08-07 16:47:38 -06:00 • committed by Tom Rini
parent dadd23ebab
commit 91fde8e176
2 changed files with 49 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
arch/sandbox/cpu/spl.c
View file

@ -3,14 +3,18 @@
* Copyright (c) 2016 Google, Inc
*/
#define LOG_CATEGORY LOGC_BOOT
#include <dm.h>
#include <hang.h>
#include <handoff.h>
#include <image.h>
#include <init.h>
#include <log.h>
#include <mapmem.h>
#include <os.h>
#include <spl.h>
#include <upl.h>
#include <asm/global_data.h>
#include <asm/spl.h>
#include <asm/state.h>
@ -52,7 +56,8 @@ void board_init_f(ulong flag)
void board_boot_order(u32 *spl_boot_list)
{
spl_boot_list[0] = BOOT_DEVICE_VBE;
spl_boot_list[1] = BOOT_DEVICE_BOARD;
spl_boot_list[1] = BOOT_DEVICE_UPL;
spl_boot_list[2] = BOOT_DEVICE_BOARD;
}
static int spl_board_load_file(struct spl_image_info *spl_image,
@ -250,3 +255,45 @@ int sandbox_spl_load_fit(char *fname, int maxlen, struct spl_image_info *image)
return 0;
}
static int upl_load_from_image(struct spl_image_info *spl_image,
struct spl_boot_device *bootdev)
{
long long size;
char *fname;
int ret, fd;
ulong addr;
if (!CONFIG_IS_ENABLED(UPL_OUT))
return -ENOTSUPP;
spl_upl_init();
fname = os_malloc(256);
ret = sandbox_spl_load_fit(fname, 256, spl_image);
if (ret)
return log_msg_ret("fit", ret);
spl_image->flags = SPL_SANDBOXF_ARG_IS_BUF;
spl_image->arg = map_sysmem(spl_image->load_addr, 0);
/* size is set by load_simple_fit(), offset is left as 0 */
/* now read the whole FIT into memory */
fd = os_open(fname, OS_O_RDONLY);
if (fd < 0)
return log_msg_ret("op2", -ENOENT);
if (os_get_filesize(fname, &size))
return log_msg_ret("fis", -ENOENT);
/* place it after the loaded image, allowing plenty of space */
addr = ALIGN(spl_image->load_addr + size, 0x1000);
log_debug("Loading whole FIT to %lx\n", addr);
if (os_read(fd, map_sysmem(addr, 0), size) != size)
return log_msg_ret("rea", -EIO);
os_close(fd);
/* tell UPL where it is */
upl_set_fit_addr(addr);
return 0;
}
SPL_LOAD_IMAGE_METHOD("upl", 4, BOOT_DEVICE_UPL, upl_load_from_image);

1
arch/sandbox/include/asm/spl.h
View file

@ -18,6 +18,7 @@ enum {
BOOT_DEVICE_NOR,
BOOT_DEVICE_SPI,
BOOT_DEVICE_NAND,
BOOT_DEVICE_UPL,
};
/**