include/configs: Use new CONFIG_CMD_* in various j* and k* named board config files.
PATCH 16/25 include/configs: Use new CONFIG_CMD_* in various j* and k* named board config files.
Signed-off-by Jon Loeliger <[email protected]>
--- include/configs/jupiter.h | 24 ++++++++++---------- include/configs/katmai.h | 53 +++++++++++++++++++++++--------------------- include/configs/kb9202.h | 25 ++++++++++++--------- include/configs/kvme080.h | 40 ++++++++++++++++++--------------- 4 files changed, 76 insertions(+), 66 deletions(-)
include/configs/jupiter.h +12 -12
@@ -41,11 +41,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 -/* * Serial console configuration */
@@ -87,15 +82,15 @@#define CONFIG_TIMESTAMP /* Print image info with timestamp */ +/* -* Supported commands +* Command line configuration. */ -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ - CFG_CMD_NFS | \ - CFG_CMD_SNTP) +#include <config_cmd_default.h> + +#define CONFIG_CMD_NFS +#define CONFIG_CMD_SNTP -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -#include <cmd_confdefs.h> /* * Autobooting
@@ -254,7 +249,7 @@#ifdef CFG_HUSH_PARSER #define CFG_PROMPT_HUSH_PS2 "> "#endif -#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 */
@@ -271,6 +266,11 @@#define CFG_HZ 1000/* decrementer freq: 1 ms ticks */ +#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 +/* * Various low-level settings */
include/configs/katmai.h +28 -25
77 lines not on this page · raw message
include/configs/kb9202.h +14 -11
@@ -78,17 +78,20 @@#define CONFIG_BOOTDELAY 3#define CONFIG_ENV_OVERWRITE 1 -#define CONFIG_COMMANDS \ - ((CONFIG_CMD_DFL | \ - CFG_CMD_I2C | \ - CFG_CMD_PING | \ - CFG_CMD_DHCP ) & \ - ~(CFG_CMD_BDI | \ - CFG_CMD_FPGA | \ - CFG_CMD_MISC)) - -/* 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_I2C +#define CONFIG_CMD_PING +#define CONFIG_CMD_DHCP + +#undef CONFIG_CMD_BDI +#undef CONFIG_CMD_FPGA +#undef CONFIG_CMD_MISC +#define CONFIG_NR_DRAM_BANKS 1#define PHYS_SDRAM 0x20000000
include/configs/kvme080.h +22 -18
@@ -67,25 +67,29 @@#define CONFIG_RTC_DS164x -#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ - CFG_CMD_ASKENV | \ - CFG_CMD_CACHE | \ - CFG_CMD_DATE | \ - CFG_CMD_DHCP | \ - CFG_CMD_DIAG | \ - CFG_CMD_EEPROM | \ - CFG_CMD_ELF | \ - CFG_CMD_I2C | \ - CFG_CMD_JFFS2 | \ - CFG_CMD_NFS | \ - CFG_CMD_PCI | \ - CFG_CMD_PING | \ - CFG_CMD_SDRAM | \ - CFG_CMD_SNTP) -#define CONFIG_NETCONSOLE +/* +* Command line configuration. +*/ +#include <config_cmd_default.h> + +#define CONFIG_CMD_ASKENV +#define CONFIG_CMD_CACHE +#define CONFIG_CMD_DATE +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_DIAG +#define CONFIG_CMD_EEPROM +#define CONFIG_CMD_ELF +#define CONFIG_CMD_I2C +#define CONFIG_CMD_JFFS2 +#define CONFIG_CMD_NFS +#define CONFIG_CMD_PCI +#define CONFIG_CMD_PING +#define CONFIG_CMD_SDRAM +#define CONFIG_CMD_SNTP -#include <cmd_confdefs.h> + +#define CONFIG_NETCONSOLE #define CFG_LONGHELP #define CFG_PROMPT "=> "
@@ -178,7 +182,7 @@#define CONFIG_SYS_CLK_FREQ 33333333#define CFG_CACHELINE_SIZE 32 -#if CONFIG_COMMANDS &CFG_CMD_KGDB +#if defined(CONFIG_CMD_KGDB )# define CFG_CACHELINE_SHIFT 5#endif
Signature · 1 line
1.5.2.2.249.g45fd