Consider CONFIG_ZERO_BOOTDELAY_CHECK when CONFIG_AUTOBOOT_KEYED is set

[pandora-u-boot.git] / common / main.c

diff --git a/common/main.c b/common/main.c
index 9405922..81984ac 100644 (file)
--- 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