diff options
| author | Heiko Schocher <hs@denx.de> | 2020-10-07 08:06:54 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-10-22 09:54:53 -0400 |
| commit | 6ebe6b387f63a17cecc91fa05284b577fe0d45f1 (patch) | |
| tree | 730bb2ca095b384072400bf7365e484dab942ea3 /common | |
| parent | 898a0849536381c6a1fb8d6d8ff7d46d9f6769eb (diff) | |
| download | u-boot-6ebe6b387f63a17cecc91fa05284b577fe0d45f1.zip u-boot-6ebe6b387f63a17cecc91fa05284b577fe0d45f1.tar.gz u-boot-6ebe6b387f63a17cecc91fa05284b577fe0d45f1.tar.bz2 | |
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>
Diffstat (limited to 'common')
| -rw-r--r-- | common/autoboot.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common/autoboot.c b/common/autoboot.c index 6d78716..74f97a0 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -363,7 +363,8 @@ void autoboot_command(const char *s) { 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; int prev; |