diff options
| author | Jon Loeliger <jdl@jdl.com> | 2007-07-04 22:32:19 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-07-05 11:04:53 +0200 |
| commit | 72eb0efaed7048afcc61fc6f0085c49394b5dc36 (patch) | |
| tree | 4c6c15231d78f7cfa01fbd68c37b85efbe788059 /include/configs/gcplus.h | |
| parent | 1bec3d3002d3bbbae6f2468a0f7376db1120d33e (diff) | |
include/configs: Use new CONFIG_CMD_* in various g* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'include/configs/gcplus.h')
| -rw-r--r-- | include/configs/gcplus.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/include/configs/gcplus.h b/include/configs/gcplus.h index b68a2dca0..0aecb38e4 100644 --- a/include/configs/gcplus.h +++ b/include/configs/gcplus.h @@ -79,18 +79,23 @@ #define CONFIG_BAUDRATE 38400 -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | CFG_CMD_DHCP) -#define CONFIG_BOOTP_MASK CONFIG_BOOTP_DEFAULT -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -#include <cmd_confdefs.h> +/* + * Command line configuration. + */ +#include <config_cmd_default.h> + +#define CONFIG_CMD_DHCP + + +#define CONFIG_BOOTP_MASK CONFIG_BOOTP_DEFAULT #define CONFIG_BOOTDELAY 3 #define CONFIG_BOOTARGS "console=ttySA0,38400n8 mtdparts=sa1100-flash:1m@0(zImage),3m@1m(ramdisk.gz),12m@4m(userfs) root=/dev/nfs ip=bootp" #define CONFIG_BOOTCOMMAND "bootp;tftp;bootm" #define CFG_AUTOLOAD "n" /* No autoload */ -#if (CONFIG_COMMANDS & CFG_CMD_KGDB) +#if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 38400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ #endif |