ppc4xx: Do not stop booting on any keypress on intip

Use CONFIG_AUTOBOOT_KEYED on intip so that booting can only be
stopped with well defined keypresses.

Signed-off-by: Dirk Eibach <eibach@gdsys.de>
Signed-off-by: Stefan Roese <sr@denx.de>

diff --git a/include/configs/intip.h b/include/configs/intip.h
index 3ff4a86ab963deb2a83e8bc2a1c677c07129f3b1..931a43f5a82f0bff5bcc143adb802056e22c81ad 100644 (file)
--- a/include/configs/intip.h
+++ b/include/configs/intip.h
@@ -37,10 +37,10 @@
 #define CONFIG_460EX           1       /* Specific PPC460EX            */
 #ifdef CONFIG_DEVCONCENTER
 #define CONFIG_HOSTNAME                devconcenter
-#define CONFIG_IDENT_STRING    " devconcenter 0.02"
+#define CONFIG_IDENT_STRING    " devconcenter 0.03"
 #else
 #define CONFIG_HOSTNAME                intip
-#define CONFIG_IDENT_STRING    " intip 0.02"
+#define CONFIG_IDENT_STRING    " intip 0.03"
 #endif
 #define CONFIG_440             1
 #define CONFIG_4xx             1       /* ... PPC4xx family */
@@ -63,6 +63,10 @@
 #define CONFIG_FIT
 #define CFG_ALT_MEMTEST
 
+#undef CONFIG_ZERO_BOOTDELAY_CHECK     /* ignore keypress on bootdelay==0 */
+#define CONFIG_AUTOBOOT_KEYED          /* use key strings to stop autoboot */
+#define CONFIG_AUTOBOOT_STOP_STR " "
+
 /*
  * Base addresses -- Note these are effective addresses where the
  * actual resources get mapped (not physical addresses)