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>

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 · Wolfgang Denk
1 parent d22650afab
Showing 1 changed file with 5 additions and 0 deletions Side-by-side Diff
common/main.c
@@ -114,6 +114,11 @@
 	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
...	...	@@ -114,6 +114,11 @@
114	114	u_int presskey_max = 0;
115	115	u_int i;
116	116
	117	+#ifndef CONFIG_ZERO_BOOTDELAY_CHECK
	118	+ if (bootdelay == 0)
	119	+ return 0;
	120	+#endif
	121	+
117	122	# ifdef CONFIG_AUTOBOOT_PROMPT
118	123	printf(CONFIG_AUTOBOOT_PROMPT);
119	124	# endif