diff options
author | Jon Loeliger <jdl@freescale.com> | 2006-08-22 10:17:59 -0500 |
---|---|---|
committer | Jon Loeliger <jdl@freescale.com> | 2006-08-22 10:17:59 -0500 |
commit | 4b7576fb804f9aae275a9ad5d947d2eb727d8cb7 (patch) | |
tree | 56a964216b21901d6279069086f713170805864f /include/configs/bamboo.h | |
parent | 5de62c47a8628b3da4d73f7c07027f32a3342d40 (diff) | |
parent | 5196a7a03bc436435787e1ad7044af94d93a5448 (diff) | |
download | u-boot-imx-4b7576fb804f9aae275a9ad5d947d2eb727d8cb7.zip u-boot-imx-4b7576fb804f9aae275a9ad5d947d2eb727d8cb7.tar.gz u-boot-imx-4b7576fb804f9aae275a9ad5d947d2eb727d8cb7.tar.bz2 |
Merge branch 'master' of http://www.denx.de/git/u-boot
Diffstat (limited to 'include/configs/bamboo.h')
-rw-r--r-- | include/configs/bamboo.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/include/configs/bamboo.h b/include/configs/bamboo.h index 2c1c319..cd4339b 100644 --- a/include/configs/bamboo.h +++ b/include/configs/bamboo.h @@ -310,11 +310,11 @@ #define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ CFG_CMD_ASKENV | \ - CFG_CMD_EEPROM | \ CFG_CMD_DATE | \ CFG_CMD_DHCP | \ CFG_CMD_DIAG | \ CFG_CMD_ELF | \ + CFG_CMD_EEPROM | \ CFG_CMD_I2C | \ CFG_CMD_IRQ | \ CFG_CMD_MII | \ @@ -358,13 +358,11 @@ #define CFG_HZ 1000 /* decrementer freq: 1 ms ticks */ -#define CONFIG_CMDLINE_EDITING - -#ifdef CONFIG_CMDLINE_EDITING -#undef CONFIG_AUTO_COMPLETE -#else -#define CONFIG_AUTO_COMPLETE -#endif +#define CONFIG_CMDLINE_EDITING 1 /* add command line history */ +#define CONFIG_LOOPW 1 /* enable loopw command */ +#define CONFIG_MX_CYCLIC 1 /* enable mdc/mwc commands */ +#define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */ +#define CONFIG_VERSION_VARIABLE 1 /* include version env variable */ /*----------------------------------------------------------------------- * PCI stuff |