mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-17 10:18:38 +00:00
b308d9fd18
This state is not accessible to the running U-Boot but at present it is allocated in the emulated SDRAM. This doesn't seem very useful. Adjust it to allocate from the OS instead. The RAM buffer is currently not freed, but should be, so add that into state_uninit(). Update the comment for os_free() to indicate that NULL is a valid parameter value. Note that the strdup() in spl_board_load_image() is changed as well, since strdup() allocates memory in the RAM buffer. Signed-off-by: Simon Glass <sjg@chromium.org>
91 lines
1.7 KiB
C
91 lines
1.7 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Copyright (c) 2016 Google, Inc
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <dm.h>
|
|
#include <hang.h>
|
|
#include <init.h>
|
|
#include <log.h>
|
|
#include <os.h>
|
|
#include <spl.h>
|
|
#include <asm/global_data.h>
|
|
#include <asm/spl.h>
|
|
#include <asm/state.h>
|
|
#include <test/test.h>
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
/* SPL / TPL init function */
|
|
void board_init_f(ulong flag)
|
|
{
|
|
struct sandbox_state *state = state_get_current();
|
|
|
|
gd->arch.ram_buf = state->ram_buf;
|
|
gd->ram_size = state->ram_size;
|
|
}
|
|
|
|
u32 spl_boot_device(void)
|
|
{
|
|
return BOOT_DEVICE_BOARD;
|
|
}
|
|
|
|
static int spl_board_load_image(struct spl_image_info *spl_image,
|
|
struct spl_boot_device *bootdev)
|
|
{
|
|
char fname[256];
|
|
int ret;
|
|
|
|
ret = os_find_u_boot(fname, sizeof(fname));
|
|
if (ret) {
|
|
printf("(%s not found, error %d)\n", fname, ret);
|
|
return ret;
|
|
}
|
|
|
|
/*
|
|
* Set up spl_image to boot from jump_to_image_no_args(). Allocate this
|
|
* outsdide the RAM buffer (i.e. don't use strdup()).
|
|
*/
|
|
spl_image->arg = os_malloc(strlen(fname) + 1);
|
|
if (!spl_image->arg)
|
|
return log_msg_ret("exec", -ENOMEM);
|
|
strcpy(spl_image->arg, fname);
|
|
|
|
return 0;
|
|
}
|
|
SPL_LOAD_IMAGE_METHOD("sandbox", 9, BOOT_DEVICE_BOARD, spl_board_load_image);
|
|
|
|
void spl_board_init(void)
|
|
{
|
|
struct sandbox_state *state = state_get_current();
|
|
|
|
preloader_console_init();
|
|
|
|
if (state->run_unittests) {
|
|
int ret;
|
|
|
|
ret = dm_test_main(state->select_unittests);
|
|
/* continue execution into U-Boot */
|
|
}
|
|
}
|
|
|
|
void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image)
|
|
{
|
|
const char *fname = spl_image->arg;
|
|
|
|
if (fname) {
|
|
os_fd_restore();
|
|
os_spl_to_uboot(fname);
|
|
} else {
|
|
printf("No filename provided for U-Boot\n");
|
|
}
|
|
hang();
|
|
}
|
|
|
|
int handoff_arch_save(struct spl_handoff *ho)
|
|
{
|
|
ho->arch.magic = TEST_HANDOFF_MAGIC;
|
|
|
|
return 0;
|
|
}
|