diff options
| author | Tom Rini <trini@konsulko.com> | 2021-03-12 15:57:20 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-03-12 15:57:20 -0500 |
| commit | c57ec2c2bab00c02a457ca70624c1333c60c2ec0 (patch) | |
| tree | 8b8b53585fd9bc655f32eba141f3c2d25d21d882 /arch/sandbox/cpu/os.c | |
| parent | 668866aa24a87244e64be42f296959297ddc5014 (diff) | |
| parent | fc3283314539d6c3fb577359f6cb364c19c13726 (diff) | |
Merge branch '2021-03-12-test-improvements' into next
- Assorted improvements to the pytest framework
Diffstat (limited to 'arch/sandbox/cpu/os.c')
| -rw-r--r-- | arch/sandbox/cpu/os.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c index f5000e64966..2d9583c17ca 100644 --- a/arch/sandbox/cpu/os.c +++ b/arch/sandbox/cpu/os.c @@ -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); |