summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorDirk Eibach <eibach@gdsys.de>2012-04-26 01:49:33 +0000
committerWolfgang Denk <wd@denx.de>2012-08-09 22:40:15 +0200
commita5aae0a1a9d289de7990ab2a684d7a1832b21be4 (patch)
treef7032954750dfb4d36ce9f534151d8ed948495d9 /common
parentd22650afabd6ce0003569f11b1605a69aac0f22c (diff)
downloadu-boot-imx-a5aae0a1a9d289de7990ab2a684d7a1832b21be4.zip
u-boot-imx-a5aae0a1a9d289de7990ab2a684d7a1832b21be4.tar.gz
u-boot-imx-a5aae0a1a9d289de7990ab2a684d7a1832b21be4.tar.bz2
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>
Diffstat (limited to 'common')
-rw-r--r--common/main.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/common/main.c b/common/main.c
index 9405922..81984ac 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