diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2007-08-07 22:30:29 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@pollux.denx.de> | 2007-08-07 22:30:29 +0200 |
| commit | 78549bbf44bd2c8d1a0730fb068836071751afaa (patch) | |
| tree | 92f002dc9772874bc3c884b1caa5607763c2c276 /include/configs/FLAGADM.h | |
| parent | 9b7464a2c88614e1061f509c48930a3d240d1a35 (diff) | |
| parent | b23b547597ff2375ad13a9ab04e5257a3ad76c99 (diff) | |
| download | u-boot-imx-78549bbf44bd2c8d1a0730fb068836071751afaa.zip u-boot-imx-78549bbf44bd2c8d1a0730fb068836071751afaa.tar.gz u-boot-imx-78549bbf44bd2c8d1a0730fb068836071751afaa.tar.bz2 | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'include/configs/FLAGADM.h')
| -rw-r--r-- | include/configs/FLAGADM.h | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/include/configs/FLAGADM.h b/include/configs/FLAGADM.h index 8babee1..431844c 100644 --- a/include/configs/FLAGADM.h +++ b/include/configs/FLAGADM.h @@ -62,21 +62,39 @@ /*#define CONFIG_WATCHDOG*/ /* watchdog enabled */ #undef CONFIG_WATCHDOG /* watchdog disabled */ -#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE) +/* + * BOOTP options + */ +#define CONFIG_BOOTP_SUBNETMASK +#define CONFIG_BOOTP_GATEWAY +#define CONFIG_BOOTP_HOSTNAME +#define CONFIG_BOOTP_BOOTPATH +#define CONFIG_BOOTP_BOOTFILESIZE + + +/* + * Command line configuration. + */ -#define CONFIG_COMMANDS (CFG_CMD_BDI | CFG_CMD_IMI | CFG_CMD_CACHE | \ - CFG_CMD_MEMORY | CFG_CMD_FLASH | CFG_CMD_LOADB | CFG_CMD_LOADS | \ - CFG_CMD_ENV | CFG_CMD_REGINFO | CFG_CMD_IMMAP | CFG_CMD_NET) +#define CONFIG_CMD_BDI +#define CONFIG_CMD_IMI +#define CONFIG_CMD_CACHE +#define CONFIG_CMD_MEMORY +#define CONFIG_CMD_FLASH +#define CONFIG_CMD_LOADB +#define CONFIG_CMD_LOADS +#define CONFIG_CMD_ENV +#define CONFIG_CMD_REGINFO +#define CONFIG_CMD_IMMAP +#define CONFIG_CMD_NET -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -#include <cmd_confdefs.h> /* * Miscellaneous configurable options */ #define CFG_LONGHELP /* undef to save memory */ #define CFG_PROMPT "EEG> " /* Monitor Command Prompt */ -#if (CONFIG_COMMANDS & CFG_CMD_KGDB) +#if defined(CONFIG_CMD_KGDB) #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */ #else #define CFG_CBSIZE 256 /* Console I/O Buffer Size */ @@ -152,7 +170,7 @@ * Cache Configuration */ #define CFG_CACHELINE_SIZE 16 /* For all MPC8xx CPUs */ -#if (CONFIG_COMMANDS & CFG_CMD_KGDB) +#if defined(CONFIG_CMD_KGDB) #define CFG_CACHELINE_SHIFT 4 /* log base 2 of the above value */ #endif |