From: Dirk Eibach <eibach@gdsys.de>
Date: Thu, 26 Apr 2012 01:49:33 +0000 (+0000)
Subject: Consider CONFIG_ZERO_BOOTDELAY_CHECK when CONFIG_AUTOBOOT_KEYED is set
X-Git-Tag: v2012.10-rc1~385
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a5aae0a1a9d289de7990ab2a684d7a1832b21be4;p=u-boot

Consider CONFIG_ZERO_BOOTDELAY_CHECK when CONFIG_AUTOBOOT_KEYED is set

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>
---

diff --git a/common/main.c b/common/main.c
index 9405922573..81984acb00 100644
--- a/common/main.c
+++ b/common/main.c
@@ -114,6 +114,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