diff options
| author | Dirk Eibach <eibach@gdsys.de> | 2011-10-04 11:13:52 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2011-10-12 11:49:43 +0200 |
| commit | 55ac719dc780cf0f4bc7d81fcec029b104a30779 (patch) | |
| tree | 2e9570f537cf6ade762f9aeee8706fe68350cdff /include | |
| parent | 0841ca90f22d73b0ea4642ef1ce33d879bb2f3ff (diff) | |
| download | talos-obmc-uboot-55ac719dc780cf0f4bc7d81fcec029b104a30779.tar.gz talos-obmc-uboot-55ac719dc780cf0f4bc7d81fcec029b104a30779.zip | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/intip.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/configs/intip.h b/include/configs/intip.h index 3ff4a86ab9..931a43f5a8 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) |
