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

[Dirk Eibach]

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 at gdsys.de>
---
Changes in v2:
- split up original patch series


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

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