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>

diff --git a/common/autoboot.c b/common/autoboot.c
index 6d78716..74f97a0 100644 (file)
--- 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;