From: Heiko Schocher Date: Wed, 7 Oct 2020 08:06:54 +0200 Subject: [PATCH] common, autoboot: sync functionality with Kconfig description Message-ID: <20201007060654.128418-1-hs@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 --- https://travis-ci.org/github/hsdenx/u-boot-test/builds/733562410 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 : ""); - if (stored_bootdelay != -1 && s && !abortboot(stored_bootdelay)) { + if (s && (stored_bootdelay == -2 || + (stored_bootdelay != -1 && !abortboot(stored_bootdelay)))) { bool lock; int prev; -- 2.25.4