diff options
| author | Tom Rini <trini@konsulko.com> | 2022-10-18 07:36:52 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-10-18 07:36:52 -0400 |
| commit | 700b4fe782f9fc46b7be1b1a93a49356baeccc3f (patch) | |
| tree | 7c4f01a95ceb7288ac9f95ffb59c2ea11b0a33cf /arch/sandbox/lib/bootm.c | |
| parent | d3031d442b941f059eb83bb67ca10a28a0539f9a (diff) | |
| parent | ae0bf2214b81b56a5670819958234947443680be (diff) | |
Merge tag 'dm-pull-18oct22' of https://source.denx.de/u-boot/custodians/u-boot-dm
Update uclass iterators to work better when devices fail to probe
Support VBE OS requests / fixups
Minor error-handling tweaks to bootm command
Diffstat (limited to 'arch/sandbox/lib/bootm.c')
| -rw-r--r-- | arch/sandbox/lib/bootm.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/arch/sandbox/lib/bootm.c b/arch/sandbox/lib/bootm.c index c1742f94de7..28f4a746fb6 100644 --- a/arch/sandbox/lib/bootm.c +++ b/arch/sandbox/lib/bootm.c @@ -50,8 +50,25 @@ int bootz_setup(ulong image, ulong *start, ulong *end) return ret; } +/* Subcommand: PREP */ +static int boot_prep_linux(struct bootm_headers *images) +{ + int ret; + + if (CONFIG_IS_ENABLED(LMB)) { + ret = image_setup_linux(images); + if (ret) + return ret; + } + + return 0; +} + int do_bootm_linux(int flag, int argc, char *argv[], struct bootm_headers *images) { + if (flag & BOOTM_STATE_OS_PREP) + return boot_prep_linux(images); + if (flag & (BOOTM_STATE_OS_GO | BOOTM_STATE_OS_FAKE_GO)) { bootstage_mark(BOOTSTAGE_ID_RUN_OS); printf("## Transferring control to Linux (at address %08lx)...\n", |