diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-06-26 10:02:52 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-06-26 10:02:52 +0200 |
| commit | f0e3d2b42268a9ed8d28c50c662eeba08379ceab (patch) | |
| tree | ac713d8a69dee7e80af82ff3b3d5b6b3062c5ee7 /include/configs/cmc_pu2.h | |
| parent | 386eda022473394ad8f36b86f2bdc9b4cb816291 (diff) | |
| parent | f73e73ba0e422e6f79030d77286dd57becaee16f (diff) | |
| download | u-boot-imx-f0e3d2b42268a9ed8d28c50c662eeba08379ceab.zip u-boot-imx-f0e3d2b42268a9ed8d28c50c662eeba08379ceab.tar.gz u-boot-imx-f0e3d2b42268a9ed8d28c50c662eeba08379ceab.tar.bz2 | |
Merge with /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" \ |