diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-08-06 01:11:08 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-08-06 01:11:08 +0200 |
| commit | f2c2a937d8c4a44f63ff88bf82023e03a29497a2 (patch) | |
| tree | fa8f7c9fb65d10259e76c40c52cf8277947424d4 /include/configs/HIDDEN_DRAGON.h | |
| parent | b1b54e352028ed370c3aa95d6fdeb9d64c5d2f86 (diff) | |
| parent | 5728be389e65fd47f34b33c2596271eb4db751ae (diff) | |
| download | u-boot-imx-f2c2a937d8c4a44f63ff88bf82023e03a29497a2.zip u-boot-imx-f2c2a937d8c4a44f63ff88bf82023e03a29497a2.tar.gz u-boot-imx-f2c2a937d8c4a44f63ff88bf82023e03a29497a2.tar.bz2 | |
Merge with /home/wd/git/u-boot/custodian/u-boot-testing
Diffstat (limited to 'include/configs/HIDDEN_DRAGON.h')
| -rw-r--r-- | include/configs/HIDDEN_DRAGON.h | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/include/configs/HIDDEN_DRAGON.h b/include/configs/HIDDEN_DRAGON.h index 6864740..26dd954 100644 --- a/include/configs/HIDDEN_DRAGON.h +++ b/include/configs/HIDDEN_DRAGON.h @@ -52,16 +52,27 @@ #define CONFIG_BAUDRATE 9600 #define CONFIG_DRAM_SPEED 100 /* MHz */ -#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ - CFG_CMD_EEPROM | \ - CFG_CMD_ELF | \ - CFG_CMD_I2C | \ - CFG_CMD_NET | \ - CFG_CMD_PCI | \ - CFG_CMD_PING ) -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -#include <cmd_confdefs.h> +/* + * BOOTP options + */ +#define CONFIG_BOOTP_BOOTFILESIZE +#define CONFIG_BOOTP_BOOTPATH +#define CONFIG_BOOTP_GATEWAY +#define CONFIG_BOOTP_HOSTNAME + + +/* + * Command line configuration. + */ +#include <config_cmd_default.h> + +#define CONFIG_CMD_EEPROM +#define CONFIG_CMD_ELF +#define CONFIG_CMD_I2C +#define CONFIG_CMD_NET +#define CONFIG_CMD_PCI +#define CONFIG_CMD_PING /* * Miscellaneous configurable options @@ -363,7 +374,7 @@ * Cache Configuration */ #define CFG_CACHELINE_SIZE 32 /* For MPC8240 CPU */ -#if (CONFIG_COMMANDS & CFG_CMD_KGDB) +#if defined(CONFIG_CMD_KGDB) # define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif |