Skip to contentSkip to conversation

common, autoboot: sync functionality with Kconfig description

PATCH New Heiko Schocher 3 participants 4 messages Oct 7, 2020 – Oct 23, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
https://travis-ci.org/github/hsdenx/u-boot-test/builds/733562410

 common/autoboot.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
common/autoboot.c +2 -1
index 6d78716a26..74f97a0513 100644
@@ -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;
 
Signature · 1 line
2.25.4
#1 lore raw

PATCH 1/1 common, autoboot: sync functionality with Kconfig description

Quoted 7 lines · Heiko Schocher

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.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201009/f3fbb6d5/attachment.sig>
#2 lore raw

PATCH 1/1 common, autoboot: sync functionality with Kconfig description

Hi Heiko,

Quoted 6 lines · Tom Rini
Quoted 3 lines · Heiko Schocher

add back again special case: -2
autoboot with no delay and no check for abort

Quoted 6 lines
Quoted 4 lines

as described in Kconfig option, see common/Kconfig help text for option BOOTDELAY.

#3 lore raw

PATCH 1/1 common, autoboot: sync functionality with Kconfig description

In reply to Heiko Schocher
Quoted 9 lines · Heiko Schocher

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.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201022/6c12dee0/attachment.sig>