brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 07:16:04 +09:00
Code Issues Projects Releases Wiki Activity

sandbox: Update os_find_u_boot() to find the .img file

Browse Source 
At present this function can only locate the u-boot ELF file. For SPL it
is handy to be able to locate u-boot.img since this is what would normally
be loaded by SPL.

Add another argument to allow this to be selected.

While we are here, update the function to load SPL when running in TPL,
since that is the next stage.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2021-03-07 17:35:13 -07:00 committed by Tom Rini
parent 8482356f48
commit 01ad9f75c5
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/sandbox/cpu/os.c
View File

@ -777,7 +777,7 @@ int os_jump_to_image(const void *dest, int size)
return os_jump_to_file(fname);
}
int os_find_u_boot(char *fname, int maxlen)
int os_find_u_boot(char *fname, int maxlen, bool use_img)
{
struct sandbox_state *state = state_get_current();
const char *progname = state->argv[0];
@ -801,8 +801,8 @@ int os_find_u_boot(char *fname, int maxlen)
return 0;
}
/* Look for 'u-boot-tpl' in the tpl/ directory */
p = strstr(fname, "/tpl/");
/* Look for 'u-boot-spl' in the spl/ directory */
p = strstr(fname, "/spl/");
if (p) {
p[1] = 's';
fd = os_open(fname, O_RDONLY);
@ -829,6 +829,8 @@ int os_find_u_boot(char *fname, int maxlen)
if (p) {
/* Remove the "spl" characters */
memmove(p, p + 4, strlen(p + 4) + 1);
if (use_img)
strcat(p, ".img");
fd = os_open(fname, O_RDONLY);
if (fd >= 0) {
close(fd);

2
arch/sandbox/cpu/spl.c
View File

@ -37,7 +37,7 @@ static int spl_board_load_image(struct spl_image_info *spl_image,
char fname[256];
int ret;
ret = os_find_u_boot(fname, sizeof(fname));
ret = os_find_u_boot(fname, sizeof(fname), false);
if (ret) {
printf("(%s not found, error %d)\n", fname, ret);
return ret;

3
include/os.h
View File

@ -324,9 +324,10 @@ int os_jump_to_image(const void *dest, int size);
*
* @fname: place to put full path to U-Boot
* @maxlen: maximum size of @fname
* @use_img: select the 'u-boot.img' file instead of the 'u-boot' ELF file
* Return: 0 if OK, -NOSPC if the filename is too large, -ENOENT if not found
*/
int os_find_u_boot(char *fname, int maxlen);
int os_find_u_boot(char *fname, int maxlen, bool use_img);
/**
* os_spl_to_uboot() - Run U-Boot proper