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/io.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/io.h')
-rw-r--r-- | include/configs/io.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/include/configs/io.h b/include/configs/io.h index 9d2a87d22d..03661cce2d 100644 --- a/include/configs/io.h +++ b/include/configs/io.h @@ -34,11 +34,13 @@ * Include common defines/options for all AMCC eval boards */ #define CONFIG_HOSTNAME io -#define CONFIG_IDENT_STRING " io 0.04" +#define CONFIG_IDENT_STRING " io 0.05" #include "amcc-common.h" -#define CONFIG_BOARD_EARLY_INIT_F /* call board_early_init_f */ -#define CONFIG_LAST_STAGE_INIT /* call last_stage_init */ +#define CONFIG_BOARD_EARLY_INIT_F +#define CONFIG_BOARD_EARLY_INIT_R +#define CONFIG_MISC_INIT_R +#define CONFIG_LAST_STAGE_INIT #define CONFIG_SYS_CLK_FREQ 33333333 /* external frequency to pll */ @@ -48,6 +50,10 @@ #define PLLMR0_DEFAULT PLLMR0_266_133_66 #define PLLMR1_DEFAULT PLLMR1_266_133_66 +#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 " " + /* new uImage format support */ #define CONFIG_FIT #define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */ @@ -76,6 +82,7 @@ * Commands additional to the ones defined in amcc-common.h */ #define CONFIG_CMD_CACHE +#define CONFIG_CMD_DTT #undef CONFIG_CMD_EEPROM /* |