diff mbox

[U-Boot,5/8] Consider CONFIG_ZERO_BOOTDELAY_CHECK when CONFIG_AUTOBOOT_KEYED is set

Message ID 1335440976-20329-5-git-send-email-eibach@gdsys.de
State Accepted
Commit a5aae0a1a9d289de7990ab2a684d7a1832b21be4
Headers show

Commit Message

Dirk Eibach April 26, 2012, 11:49 a.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>
---
 common/main.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
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