diff options
| author | Jon Loeliger <jdl@freescale.com> | 2007-07-08 15:12:40 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2007-07-08 16:05:39 -0500 |
| commit | e9a0f8f15c11f337967aa0600ad6e8af33037f50 (patch) | |
| tree | ce956f729e6db3ad0994a955a18c0d3d31ecf33c /include/configs/RPXsuper.h | |
| parent | 12aa9fd23d724bd6ab88e1baa0db35133a27303f (diff) | |
| download | blackbird-obmc-uboot-e9a0f8f15c11f337967aa0600ad6e8af33037f50.tar.gz blackbird-obmc-uboot-e9a0f8f15c11f337967aa0600ad6e8af33037f50.zip | |
include/configs: Use new CONFIG_CMD_* in various R* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'include/configs/RPXsuper.h')
| -rw-r--r-- | include/configs/RPXsuper.h | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/include/configs/RPXsuper.h b/include/configs/RPXsuper.h index 45907aa0e7..c39aff19bc 100644 --- a/include/configs/RPXsuper.h +++ b/include/configs/RPXsuper.h @@ -150,13 +150,19 @@ /* Monitor Command Prompt */ #define CFG_PROMPT "=> " -/* What U-Boot subsytems do you want enabled? */ -#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ - CFG_CMD_IMMAP | \ - CFG_CMD_ASKENV | \ - CFG_CMD_I2C | \ - CFG_CMD_REGINFO & \ - ~CFG_CMD_KGDB ) + +/* + * Command line configuration. + */ +#include <config_cmd_default.h> + +#define CONFIG_CMD_IMMAP +#define CONFIG_CMD_ASKENV +#define CONFIG_CMD_I2C +#define CONFIG_CMD_REGINFO + +#undef CONFIG_CMD_KGDB + /* Where do the internal registers live? */ #define CFG_IMMR 0xF0000000 @@ -176,13 +182,10 @@ #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */ -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -#include <cmd_confdefs.h> - /* * Miscellaneous configurable options */ -#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 */ @@ -310,7 +313,7 @@ */ #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 |
