mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 15:14:43 +00:00
common, autoboot: sync functionality with Kconfig description
add back again special case: -2 autoboot with no delay and no check for abort as described in Kconfig option, see common/Kconfig help text for option BOOTDELAY. Signed-off-by: Heiko Schocher <hs@denx.de> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
898a084953
commit
6ebe6b387f
1 changed files with 2 additions and 1 deletions
|
@ -363,7 +363,8 @@ void autoboot_command(const char *s)
|
||||||
{
|
{
|
||||||
debug("### main_loop: bootcmd=\"%s\"\n", s ? s : "<UNDEFINED>");
|
debug("### main_loop: bootcmd=\"%s\"\n", s ? s : "<UNDEFINED>");
|
||||||
|
|
||||||
if (stored_bootdelay != -1 && s && !abortboot(stored_bootdelay)) {
|
if (s && (stored_bootdelay == -2 ||
|
||||||
|
(stored_bootdelay != -1 && !abortboot(stored_bootdelay)))) {
|
||||||
bool lock;
|
bool lock;
|
||||||
int prev;
|
int prev;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue