浏览代码

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>
Dirk Eibach 13 年之前
父节点
当前提交
a5aae0a1a9
共有 1 个文件被更改,包括 5 次插入0 次删除
  1. 5 0
      common/main.c

+ 5 - 0
common/main.c

@@ -114,6 +114,11 @@ int abortboot(int bootdelay)
 	u_int presskey_max = 0;
 	u_int presskey_max = 0;
 	u_int i;
 	u_int i;
 
 
+#ifndef CONFIG_ZERO_BOOTDELAY_CHECK
+	if (bootdelay == 0)
+		return 0;
+#endif
+
 #  ifdef CONFIG_AUTOBOOT_PROMPT
 #  ifdef CONFIG_AUTOBOOT_PROMPT
 	printf(CONFIG_AUTOBOOT_PROMPT);
 	printf(CONFIG_AUTOBOOT_PROMPT);
 #  endif
 #  endif