* [PATCH] common, autoboot: sync functionality with Kconfig description
@ 2020-10-07 6:06 Heiko Schocher
2020-10-09 13:21 ` Tom Rini
2020-10-23 0:27 ` Tom Rini
0 siblings, 2 replies; 4+ messages in thread
From: Heiko Schocher @ 2020-10-07 6:06 UTC (permalink / raw)
To: u-boot
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>
---
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 : "<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.25.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH] common, autoboot: sync functionality with Kconfig description
2020-10-07 6:06 [PATCH] common, autoboot: sync functionality with Kconfig description Heiko Schocher
@ 2020-10-09 13:21 ` Tom Rini
2020-10-09 17:23 ` Simon Glass
2020-10-23 0:27 ` Tom Rini
1 sibling, 1 reply; 4+ messages in thread
From: Tom Rini @ 2020-10-09 13:21 UTC (permalink / raw)
To: u-boot
On Wed, Oct 07, 2020 at 08:06:54AM +0200, Heiko Schocher wrote:
> 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>
--
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>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] common, autoboot: sync functionality with Kconfig description
2020-10-09 13:21 ` Tom Rini
@ 2020-10-09 17:23 ` Simon Glass
0 siblings, 0 replies; 4+ messages in thread
From: Simon Glass @ 2020-10-09 17:23 UTC (permalink / raw)
To: u-boot
Hi Heiko,
On Fri, 9 Oct 2020 at 07:21, Tom Rini <trini@konsulko.com> wrote:
>
> On Wed, Oct 07, 2020 at 08:06:54AM +0200, Heiko Schocher wrote:
>
> > 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>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] common, autoboot: sync functionality with Kconfig description
2020-10-07 6:06 [PATCH] common, autoboot: sync functionality with Kconfig description Heiko Schocher
2020-10-09 13:21 ` Tom Rini
@ 2020-10-23 0:27 ` Tom Rini
1 sibling, 0 replies; 4+ messages in thread
From: Tom Rini @ 2020-10-23 0:27 UTC (permalink / raw)
To: u-boot
On Wed, Oct 07, 2020 at 08:06:54AM +0200, Heiko Schocher wrote:
> 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>
Applied to u-boot/master, thanks!
--
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>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-10-23 0:27 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-07 6:06 [PATCH] common, autoboot: sync functionality with Kconfig description Heiko Schocher
2020-10-09 13:21 ` Tom Rini
2020-10-09 17:23 ` Simon Glass
2020-10-23 0:27 ` Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox