diff mbox

[U-Boot,v2] Consider CONFIG_ZERO_BOOTDELAY_CHECK when CONFIG_AUTOBOOT_KEYED is set

Message ID 1335448625-21180-2-git-send-email-eibach@gdsys.de
State Accepted
Delegated to: Wolfgang Denk
Headers show

Commit Message

Dirk Eibach April 26, 2012, 1:57 p.m. UTC 
When CONFIG_ZERO_BOOTDELAY_CHECK is not defined, bootdelay==0 prevents the check for console input (as stated in README.autoboot).
This must also work in CONFIG_AUTOBOOT_KEYED mode.

Signed-off-by: Dirk Eibach <eibach@gdsys.de>
---
Changes in v2:
- split up original patch series


 common/main.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

Comments

Wolfgang Denk Aug. 9, 2012, 8:41 p.m. UTC | #1 
Dear Dirk Eibach,

In message <1335448625-21180-2-git-send-email-eibach@gdsys.de> you wrote:
> When CONFIG_ZERO_BOOTDELAY_CHECK is not defined, bootdelay==0 prevents the check for console input (as stated in README.autoboot).
> This must also work in CONFIG_AUTOBOOT_KEYED mode.
> 
> Signed-off-by: Dirk Eibach <eibach@gdsys.de>
> ---
> Changes in v2:
> - split up original patch series
> 
> 
>  common/main.c |    5 +++++
>  1 files changed, 5 insertions(+), 0 deletions(-)

Applied, thanks.

But _please_ use a line length of <70 characters in the subject and
the commit message.  Thanks.

Best regards,

Wolfgang Denk
diff mbox

Patch

diff --git a/common/main.c b/common/main.c
index 3b9e39a..b40f96e 100644
--- a/common/main.c
+++ b/common/main.c
@@ -113,6 +113,11 @@  int abortboot(int bootdelay)
 	u_int presskey_max = 0;
 	u_int i;
 
+#ifndef CONFIG_ZERO_BOOTDELAY_CHECK
+	if (bootdelay == 0)
+		return 0;
+#endif
+
 #  ifdef CONFIG_AUTOBOOT_PROMPT
 	printf(CONFIG_AUTOBOOT_PROMPT);
 #  endif