projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
pci: Move CONFIG_PCI_PNP to Kconfig
[platform/kernel/u-boot.git]
/
common
/
bootm_os.c
diff --git
a/common/bootm_os.c
b/common/bootm_os.c
index
9ec84bd
..
e3f5a46
100644
(file)
--- 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);