include/configs: Use new CONFIG_CMD_* in various h* named board config files.
PATCH 14/25 include/configs: Use new CONFIG_CMD_* in various h* named board config files.
Signed-off-by Jon Loeliger <[email protected]>
--- include/configs/hermes.h | 16 +++++------ include/configs/hmi1001.h | 40 +++++++++++++++--------------- include/configs/hymod.h | 60 +++++++++++++++++++++++--------------------- 3 files changed, 58 insertions(+), 58 deletions(-)
include/configs/hermes.h +7 -9
@@ -64,23 +64,21 @@#undef CONFIG_WATCHDOG/* watchdog disabled */ -#define CONFIG_COMMANDS CONFIG_CMD_DFL -#define CONFIG_BOOTP_MASK CONFIG_BOOTP_DEFAULT - -/*----------------------------------------------------------------------*/ +/* +* Command line configuration. +*/ +#include <config_cmd_default.h> -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -#include <cmd_confdefs.h> -/*----------------------------------------------------------------------*/ +#define CONFIG_BOOTP_MASK CONFIG_BOOTP_DEFAULT/* * 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 */
@@ -157,7 +155,7 @@* Cache Configuration */ #define CFG_CACHELINE_SIZE 16/* For all MPC8xx CPUs */ -#if (CONFIG_COMMANDS &CFG_CMD_KGDB ) +#if defined(CONFIG_CMD_KGDB )#define CFG_CACHELINE_SHIFT 4/* log base 2 of the above value */ #endif
include/configs/hmi1001.h +20 -20
@@ -38,11 +38,6 @@#define BOOTFLAG_COLD 0x01/* Normal Power-On: Boot from FLASH */ #define BOOTFLAG_WARM 0x02/* Software reboot */ -#define CFG_CACHELINE_SIZE 32/* For MPC5xxx CPUs */ -#if (CONFIG_COMMANDS &CFG_CMD_KGDB ) -# define CFG_CACHELINE_SHIFT 5/* log base 2 of the above value */ -#endif -#define CONFIG_BOARD_EARLY_INIT_R /*
@@ -55,22 +50,22 @@/* Partitions */ #define CONFIG_DOS_PARTITION +/* -* Supported commands +* Command line configuration. */ -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ - CFG_CMD_DATE | \ - CFG_CMD_DISPLAY | \ - CFG_CMD_DHCP | \ - CFG_CMD_EEPROM | \ - CFG_CMD_I2C | \ - CFG_CMD_IDE | \ - CFG_CMD_NFS | \ - CFG_CMD_PCI | \ - CFG_CMD_SNTP ) - -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -#include <cmd_confdefs.h> +#include <config_cmd_default.h> + +#define CONFIG_CMD_DATE +#define CONFIG_CMD_DISPLAY +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_EEPROM +#define CONFIG_CMD_I2C +#define CONFIG_CMD_IDE +#define CONFIG_CMD_NFS +#define CONFIG_CMD_PCI +#define CONFIG_CMD_SNTP +#define CONFIG_TIMESTAMP 1/* Print image info with timestamp */
@@ -222,7 +217,7 @@*/ #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 */
@@ -231,6 +226,11 @@#define CFG_MAXARGS 16/* max number of command args */ #define CFG_BARGSIZE CFG_CBSIZE/* Boot Argument Buffer Size */ +#define CFG_CACHELINE_SIZE 32/* For MPC5xxx CPUs */ +#if defined(CONFIG_CMD_KGDB ) +# define CFG_CACHELINE_SHIFT 5/* log base 2 of the above value */ +#endif +/* Enable an alternate, more extensive memory test */ #define CFG_ALT_MEMTEST
include/configs/hymod.h +31 -29
84 lines not on this page · raw message
Signature · 1 line
1.5.2.2.249.g45fd