diff options
| author | Jon Loeliger <jdl@jdl.com> | 2007-07-04 22:33:13 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-07-05 11:05:06 +0200 |
| commit | a5cb23092a7d31490a33d4ec871468b63babfa3c (patch) | |
| tree | 043818080cb56bcb6f5292b9cef201b2ef47b339 /include/configs/omap1510inn.h | |
| parent | 929a2bfd142737003a8fc32e1b86e1f2c1850257 (diff) | |
include/configs: Use new CONFIG_CMD_* in various o* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'include/configs/omap1510inn.h')
| -rw-r--r-- | include/configs/omap1510inn.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/include/configs/omap1510inn.h b/include/configs/omap1510inn.h index 016d3d8bd0..11fdb47101 100644 --- a/include/configs/omap1510inn.h +++ b/include/configs/omap1510inn.h @@ -86,11 +86,19 @@ #define CONFIG_BAUDRATE 115200 #define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | CFG_CMD_DHCP) +#define CONFIG_COMMANDS (CONFIG_CMD_DFL + + +/* + * Command line configuration. + */ +#include <config_cmd_default.h> + +#define CONFIG_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> #include <configs/omap1510.h> #define CONFIG_BOOTDELAY 3 @@ -98,7 +106,7 @@ #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 115200 /* speed to run kgdb serial port */ /* what's this ? it's not used anywhere */ #define CONFIG_KGDB_SER_INDEX 1 /* which serial port to use */ |