diff options
| author | Simon Glass | 2016-07-03 09:40:35 -0600 |
|---|---|---|
| committer | Tom Rini | 2016-07-14 18:22:32 -0400 |
| commit | b9c771b04c215de981987a92d5e1f016c8dd1921 (patch) | |
| tree | f7c5aa8b23d82160b9017bbcb85a1985446b1ee4 /common | |
| parent | 07f4eadc99b365fa92114f19c02218ff39c45ed9 (diff) | |
sandbox: Don't exit when bootm completes
At present sandbox exits when the 'bootm' command completes, since it is not
actually able to run the OS that is loaded. Normally 'bootm' failure is
considered a fatal error in U-Boot.
However this is annoying for tests, which may want to examine the state
after a test is complete. In any case there is a 'reset' command which can
be used to exit, if required.
Change the behaviour to return normally from the 'bootm' command on sandbox.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Teddy Reed <teddy.reed@gmail.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/bootm_os.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/common/bootm_os.c b/common/bootm_os.c index 9ec84bd0dbe..e3f5a464120 100644 --- a/common/bootm_os.c +++ b/common/bootm_os.c @@ -481,6 +481,7 @@ int boot_selected_os(int argc, char * const argv[], int state, /* Stand-alone may return when 'autostart' is 'no' */ if (images->os.type == IH_TYPE_STANDALONE || + IS_ENABLED(CONFIG_SANDBOX) || state == BOOTM_STATE_OS_FAKE_GO) /* We expect to return */ return 0; bootstage_error(BOOTSTAGE_ID_BOOT_OS_RETURNED); |