diff mbox

[U-Boot] ppc4xx: Do not stop booting on any keypress on intip

Message ID 1317719635-2792-2-git-send-email-eibach@gdsys.de
State Accepted
Commit 55ac719dc780cf0f4bc7d81fcec029b104a30779
Delegated to: Stefan Roese
Headers show

Commit Message

Dirk Eibach Oct. 4, 2011, 9:13 a.m. UTC 
From: Dirk Eibach <eibach@gdsys.de>

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>
---
 include/configs/intip.h |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

Comments

Stefan Roese Oct. 12, 2011, 9:49 a.m. UTC | #1 
On Tuesday 04 October 2011 11:13:52 eibach@gdsys.de wrote:
> From: Dirk Eibach <eibach@gdsys.de>
> 
> Use CONFIG_AUTOBOOT_KEYED on intip so that booting can only be
> stopped with well defined keypresses.

Applied to u-boot-ppc4xx/master. Thanks.

Best regards,
Stefan

--
DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office@denx.de
diff mbox

Patch

diff --git a/include/configs/intip.h b/include/configs/intip.h
index 3ff4a86..931a43f 100644
--- 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)