diff options
| author | Jon Loeliger <jdl@jdl.com> | 2007-06-13 13:22:08 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-07-05 03:41:29 +0200 |
| commit | 2835e518c969e5124ba1174eef3e8375e12fa7d5 (patch) | |
| tree | d1dcb1dfbc85e02096e99f482ed553efa27f71ee /include/configs/MPC8544DS.h | |
| parent | 56b304ac2091689506088a9ae67f63fd6300cf16 (diff) | |
| download | u-boot-imx-2835e518c969e5124ba1174eef3e8375e12fa7d5.zip u-boot-imx-2835e518c969e5124ba1174eef3e8375e12fa7d5.tar.gz u-boot-imx-2835e518c969e5124ba1174eef3e8375e12fa7d5.tar.bz2 | |
include/configs: Use new CONFIG_CMD_* in 85xx board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'include/configs/MPC8544DS.h')
| -rw-r--r-- | include/configs/MPC8544DS.h | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index 7cd62e9..b33d225 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -392,21 +392,22 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ + +/* + * Command line configuration. + */ +#include <config_cmd_default.h> + +#define CONFIG_CMD_PING +#define CONFIG_CMD_I2C +#define CONFIG_CMD_MII + #if defined(CONFIG_PCI) -#define CONFIG_COMMANDS (CONFIG_CMD_DFL \ - | CFG_CMD_PCI \ - | CFG_CMD_PING \ - | CFG_CMD_I2C \ - | CFG_CMD_MII \ - | CFG_CMD_BEDBUG \ - | CFG_CMD_NET) -#else -#define CONFIG_COMMANDS (CONFIG_CMD_DFL \ - | CFG_CMD_PING \ - | CFG_CMD_I2C \ - | CFG_CMD_MII) + #define CONFIG_CMD_PCI + #define CONFIG_CMD_BEDBUG + #define CONFIG_CMD_NET #endif -#include <cmd_confdefs.h> + #undef CONFIG_WATCHDOG /* watchdog disabled */ @@ -416,7 +417,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CFG_LONGHELP /* undef to save memory */ #define CFG_LOAD_ADDR 0x2000000 /* default load address */ #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 */ @@ -436,7 +437,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* Cache Configuration */ #define CFG_DCACHE_SIZE 32768 #define CFG_CACHELINE_SIZE 32 -#if (CONFIG_COMMANDS & CFG_CMD_KGDB) +#if defined(CONFIG_CMD_KGDB) #define CFG_CACHELINE_SHIFT 5 /*log base 2 of the above value*/ #endif @@ -448,7 +449,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ #define BOOTFLAG_WARM 0x02 /* Software reboot */ -#if (CONFIG_COMMANDS & CFG_CMD_KGDB) +#if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ #endif |