diff options
| author | Wolfgang Denk <wd@atlas.denx.de> | 2006-06-19 01:37:03 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@atlas.denx.de> | 2006-06-19 01:37:03 +0200 |
| commit | a650cfa286e8933144a776693d56dfd858922aa4 (patch) | |
| tree | 1848c6ba3c8115b516d6711cad787d1e6a9d2fb5 /include/configs/cmc_pu2.h | |
| parent | df02bd1b3f2eecca04bfecb62eae7c2ff698506a (diff) | |
| parent | 0c32d96ddd7309b86ff92dfc1f3694908f174cf6 (diff) | |
| download | u-boot-imx-a650cfa286e8933144a776693d56dfd858922aa4.zip u-boot-imx-a650cfa286e8933144a776693d56dfd858922aa4.tar.gz u-boot-imx-a650cfa286e8933144a776693d56dfd858922aa4.tar.bz2 | |
Merge with ssh://fifi/home/wd/git/u-boot/master
Diffstat (limited to 'include/configs/cmc_pu2.h')
| -rw-r--r-- | include/configs/cmc_pu2.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/include/configs/cmc_pu2.h b/include/configs/cmc_pu2.h index 46280f7..572a70f 100644 --- a/include/configs/cmc_pu2.h +++ b/include/configs/cmc_pu2.h @@ -108,7 +108,7 @@ /* still about 20 kB free with this defined */ #define CFG_LONGHELP -#define CONFIG_BOOTDELAY 3 +#define CONFIG_BOOTDELAY 1 #ifdef CONFIG_HARD_I2C #define CONFIG_COMMANDS \ @@ -206,15 +206,6 @@ struct bd_info_ext { #error CONFIG_USE_IRQ not supported #endif -#define CFG_DEVICE_NULLDEV 1 /* enble null device */ -#define CONFIG_SILENT_CONSOLE 1 /* enable silent startup */ - -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_PROMPT "autoboot in %d seconds\n" -#define CONFIG_AUTOBOOT_STOP_STR "R" /* default password */ - -#define CONFIG_VERSION_VARIABLE 1 /* include version env variable */ - #define CONFIG_EXTRA_ENV_SETTINGS \ "net_nfs=tftp ${loadaddr} ${bootfile};run nfsargs addip addcons " \ "addmtd;bootm\0" \ |