configs/ mpc86xx: Rewrite command line options using new CONFIG_CMD-* style.
PATCH 19/19 configs/ mpc86xx: Rewrite command line options using new CONFIG_CMD-* style.
Signed-off-by Jon Loeliger <[email protected]>
--- include/configs/MPC8641HPCN.h | 58 +++++++++++++++------------------------- 1 files changed, 22 insertions(+), 36 deletions(-)
include/configs/MPC8641HPCN.h +22 -36
@@ -475,39 +475,25 @@#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 +#if defined(CFG_RAMBOOT ) -#if defined(CONFIG_PCI ) -#define CONFIG_COMMANDS ((CONFIG_CMD_DFL \ - | CFG_CMD_PING \ - | CFG_CMD_PCI \ - | CFG_CMD_I2C \ - | CFG_CMD_SCSI \ - | CFG_CMD_EXT2) \ - & \ - ~(CFG_CMD_ENV)) -#else -#define CONFIG_COMMANDS ((CONFIG_CMD_DFL \ - | CFG_CMD_PING \ - | CFG_CMD_I2C) \ - & \ - ~(CFG_CMD_ENV)) -#endif -#else -#if defined(CONFIG_PCI ) -#define CONFIG_COMMANDS (CONFIG_CMD_DFL \ - | CFG_CMD_PCI \ - | CFG_CMD_PING \ - | CFG_CMD_I2C \ - | CFG_CMD_SCSI \ - | CFG_CMD_EXT2) -#else -#define CONFIG_COMMANDS (CONFIG_CMD_DFL \ - | CFG_CMD_PING \ - | CFG_CMD_I2C) -#endif +#undef CONFIG_CMD_ENV +#endif + +#if defined(CONFIG_PCI ) +#define CONFIG_CMD_PCI +#define CONFIG_CMD_SCSI +#define CONFIG_CMD_EXT2 #endif -#include <cmd_confdefs.h> #undef CONFIG_WATCHDOG/* watchdog disabled */
@@ -518,7 +504,7 @@#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 */
@@ -539,8 +525,8 @@/* Cache Configuration */ #define CFG_DCACHE_SIZE 32768#define CFG_CACHELINE_SIZE 32 -#if (CONFIG_COMMANDS &CFG_CMD_KGDB ) -#define CFG_CACHELINE_SHIFT 5/*log base 2 of the above value*/ +#if defined(CONFIG_CMD_KGDB ) +#define CFG_CACHELINE_SHIFT 5/*log base 2 of the above value*/ #endif /*
@@ -551,9 +537,9 @@#define BOOTFLAG_COLD 0x01/* Normal Power-On: Boot from FLASH */ #define BOOTFLAG_WARM 0x02/* Software reboot */ -#if (CONFIG_COMMANDS &CFG_CMD_KGDB ) -#define CONFIG_KGDB_BAUDRATE 230400/* speed to run kgdb serial port */ -#define CONFIG_KGDB_SER_INDEX 2/* which serial port to use */ +#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 /*
Signature · 1 line
1.5.2.1.239.g75d8