diff options
author | Jon Loeliger <jdl@freescale.com> | 2007-07-08 15:02:44 -0500 |
---|---|---|
committer | Jon Loeliger <jdl@freescale.com> | 2007-07-08 16:05:42 -0500 |
commit | fe7f782d5b8c64a0195c68c31a0a11d4f641355e (patch) | |
tree | d74891b5263420f5c12dd9b63b11d274342f68ba /include/configs/SCM.h | |
parent | e9a0f8f15c11f337967aa0600ad6e8af33037f50 (diff) |
include/configs: Use new CONFIG_CMD_* in various S* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'include/configs/SCM.h')
-rw-r--r-- | include/configs/SCM.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/include/configs/SCM.h b/include/configs/SCM.h index e263db65a2f..67dbc55dbb5 100644 --- a/include/configs/SCM.h +++ b/include/configs/SCM.h @@ -193,21 +193,24 @@ #define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT|CONFIG_BOOTP_BOOTFILESIZE) -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ - CFG_CMD_DHCP | \ - CFG_CMD_I2C | \ - CFG_CMD_EEPROM | \ - CFG_CMD_BSP) -/* 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_CMD_I2C +#define CONFIG_CMD_EEPROM +#define CONFIG_CMD_BSP + /* * Miscellaneous configurable options */ #define CFG_LONGHELP /* undef to save memory */ #define CFG_PROMPT "=> " /* 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 */ @@ -353,7 +356,7 @@ * Cache Configuration */ #define CFG_CACHELINE_SIZE 32 /* For MPC8260 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 |