diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-04-30 16:55:37 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-04-30 16:55:37 +0200 |
| commit | e0f6a4e8b17afead8add6e528936a505367c091c (patch) | |
| tree | 27df2ba6194aa03a6e4da948c66113076f17f978 /include/configs/gdppc440etx.h | |
| parent | f588bb034d5d3a0417f45965f1aba4d4cf8a2893 (diff) | |
| parent | 4212657c53f9ed66fd5adc9da9a327e3739646fb (diff) | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
* 'master' of /home/wd/git/u-boot/custodians:
powerpc/ppc4xx: Remove typedefs for gdsys FPGA
powerpc/ppc4xx: Fix typo in gdsys_fpga.h
powerpc/ppc4xx: Update gdsys board configurations
powerpc/ppc4xx: Support gdsys dlvision-10g hardware 1.20
powerpc/ppc4xx: Adapt gdsys 405ep boards to platform changes
powerpc/ppc4xx: Make gdsys 405ep boards reset more generic
powerpc/ppc4xx: Adjust environment size on neo
Diffstat (limited to 'include/configs/gdppc440etx.h')
| -rw-r--r-- | include/configs/gdppc440etx.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/configs/gdppc440etx.h b/include/configs/gdppc440etx.h index 3c59ff4922..9efbb8e34c 100644 --- a/include/configs/gdppc440etx.h +++ b/include/configs/gdppc440etx.h @@ -50,6 +50,10 @@ #define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f*/ #define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */ +#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) |