From 6ebe6b387f63a17cecc91fa05284b577fe0d45f1 Mon Sep 17 00:00:00 2001
From: Heiko Schocher <hs@denx.de>
Date: Wed, 7 Oct 2020 08:06:54 +0200
Subject: [PATCH] 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>
---
common/autoboot.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/common/autoboot.c b/common/autoboot.c
index 6d78716a26..74f97a0513 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;
--
2.39.5