include/configs: Use new CONFIG_CMD_* in various F* and G* named board config files.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
This commit is contained in:
Jon Loeliger 2007-07-07 21:04:26 -05:00
parent dcaa715628
commit 60a0876b51
9 changed files with 114 additions and 86 deletions

View File

@ -107,15 +107,18 @@
#define CONFIG_BOOTP_MASK CONFIG_BOOTP_ALL #define CONFIG_BOOTP_MASK CONFIG_BOOTP_ALL
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /*
#include <cmd_confdefs.h> * Command line configuration.
*/
#include <config_cmd_default.h>
/* /*
* Miscellaneous configurable options * Miscellaneous configurable options
*/ */
#define CFG_LONGHELP /* undef to save memory */ #define CFG_LONGHELP /* undef to save memory */
#define CFG_PROMPT ":>" /* Monitor Command Prompt */ #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 */ #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */
#else #else
#define CFG_CBSIZE 256 /* Console I/O Buffer Size */ #define CFG_CBSIZE 256 /* Console I/O Buffer Size */
@ -190,7 +193,7 @@
* Cache Configuration * Cache Configuration
*/ */
#define CFG_CACHELINE_SIZE 16 /* For all MPC8xx CPUs */ #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 */ #define CFG_CACHELINE_SHIFT 4 /* log base 2 of the above value */
#endif #endif

View File

@ -61,15 +61,19 @@
#undef CONFIG_WATCHDOG /* watchdog disabled */ #undef CONFIG_WATCHDOG /* watchdog disabled */
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h> /*
* Command line configuration.
*/
#include <config_cmd_default.h>
/* /*
* Miscellaneous configurable options * Miscellaneous configurable options
*/ */
#undef CFG_LONGHELP /* undef to save memory */ #undef CFG_LONGHELP /* undef to save memory */
#define CFG_PROMPT ":>" /* Monitor Command Prompt */ #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 */ #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */
#else #else
#define CFG_CBSIZE 256 /* Console I/O Buffer Size */ #define CFG_CBSIZE 256 /* Console I/O Buffer Size */
@ -148,7 +152,7 @@
* Cache Configuration * Cache Configuration
*/ */
#define CFG_CACHELINE_SIZE 16 /* For all MPC8xx CPUs */ #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 */ #define CFG_CACHELINE_SHIFT 4 /* log base 2 of the above value */
#endif #endif

View File

@ -64,19 +64,29 @@
#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE) #define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE)
#define CONFIG_COMMANDS (CFG_CMD_BDI | CFG_CMD_IMI | CFG_CMD_CACHE | \ /*
CFG_CMD_MEMORY | CFG_CMD_FLASH | CFG_CMD_LOADB | CFG_CMD_LOADS | \ * Command line configuration.
CFG_CMD_ENV | CFG_CMD_REGINFO | CFG_CMD_IMMAP | CFG_CMD_NET) */
#define CONFIG_CMD_BDI
#define CONFIG_CMD_IMI
#define CONFIG_CMD_CACHE
#define CONFIG_CMD_MEMORY
#define CONFIG_CMD_FLASH
#define CONFIG_CMD_LOADB
#define CONFIG_CMD_LOADS
#define CONFIG_CMD_ENV
#define CONFIG_CMD_REGINFO
#define CONFIG_CMD_IMMAP
#define CONFIG_CMD_NET
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h>
/* /*
* Miscellaneous configurable options * Miscellaneous configurable options
*/ */
#define CFG_LONGHELP /* undef to save memory */ #define CFG_LONGHELP /* undef to save memory */
#define CFG_PROMPT "EEG> " /* Monitor Command Prompt */ #define CFG_PROMPT "EEG> " /* Monitor Command Prompt */
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
#define CFG_CBSIZE 1024 /* Console I/O Buffer Size */ #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */
#else #else
#define CFG_CBSIZE 256 /* Console I/O Buffer Size */ #define CFG_CBSIZE 256 /* Console I/O Buffer Size */
@ -152,7 +162,7 @@
* Cache Configuration * Cache Configuration
*/ */
#define CFG_CACHELINE_SIZE 16 /* For all MPC8xx CPUs */ #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 */ #define CFG_CACHELINE_SHIFT 4 /* log base 2 of the above value */
#endif #endif

View File

@ -62,22 +62,25 @@
#define CONFIG_BOOTP_MASK CONFIG_BOOTP_ALL #define CONFIG_BOOTP_MASK CONFIG_BOOTP_ALL
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL & ~( \
CFG_CMD_CONSOLE | \
CFG_CMD_BDI | \
CFG_CMD_LOADS | \
CFG_CMD_LOADB | \
CFG_CMD_CACHE ) )
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ /*
#include <cmd_confdefs.h> * Command line configuration.
*/
#include <config_cmd_default.h>
#undef CONFIG_CMD_CONSOLE
#undef CONFIG_CMD_BDI
#undef CONFIG_CMD_LOADS
#undef CONFIG_CMD_LOADB
#undef CONFIG_CMD_CACHE
/* /*
* Miscellaneous configurable options * Miscellaneous configurable options
*/ */
#define CFG_LONGHELP /* undef to save memory */ #define CFG_LONGHELP /* undef to save memory */
#define CFG_PROMPT "=> " /* Monitor Command Prompt */ #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 */ #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */
#else #else
#define CFG_CBSIZE 256 /* Console I/O Buffer Size */ #define CFG_CBSIZE 256 /* Console I/O Buffer Size */
@ -160,7 +163,7 @@
* Cache Configuration * Cache Configuration
*/ */
#define CFG_CACHELINE_SIZE 16 /* For all MPC8xx CPUs */ #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 */ #define CFG_CACHELINE_SHIFT 4 /* log base 2 of the above value */
#endif #endif

View File

@ -62,22 +62,24 @@
#define CONFIG_RTC_MPC8xx /* use internal RTC of MPC8xx */ #define CONFIG_RTC_MPC8xx /* use internal RTC of MPC8xx */
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_ASKENV | \
CFG_CMD_DATE | \
CFG_CMD_DHCP | \
CFG_CMD_NFS | \
CFG_CMD_SNTP )
/* 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_ASKENV
#define CONFIG_CMD_DATE
#define CONFIG_CMD_DHCP
#define CONFIG_CMD_NFS
#define CONFIG_CMD_SNTP
/* /*
* Miscellaneous configurable options * Miscellaneous configurable options
*/ */
#define CFG_LONGHELP /* undef to save memory */ #define CFG_LONGHELP /* undef to save memory */
#define CFG_PROMPT "=> " /* Monitor Command Prompt */ #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 */ #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */
#else #else
#define CFG_CBSIZE 256 /* Console I/O Buffer Size */ #define CFG_CBSIZE 256 /* Console I/O Buffer Size */
@ -160,7 +162,7 @@
* Cache Configuration * Cache Configuration
*/ */
#define CFG_CACHELINE_SIZE 16 /* For all MPC8xx CPUs */ #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 */ #define CFG_CACHELINE_SHIFT 4 /* log base 2 of the above value */
#endif #endif

View File

@ -88,20 +88,23 @@
#define CONFIG_PHY_CLK_FREQ EMAC_STACR_CLK_66MHZ /* 66 MHz OPB clock*/ #define CONFIG_PHY_CLK_FREQ EMAC_STACR_CLK_66MHZ /* 66 MHz OPB clock*/
#endif #endif
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_DHCP | \
CFG_CMD_PCI | \
CFG_CMD_IRQ | \
CFG_CMD_ELF | \
CFG_CMD_DATE | \
CFG_CMD_I2C | \
CFG_CMD_MII | \
CFG_CMD_PING | \
CFG_CMD_BSP | \
CFG_CMD_EEPROM )
/* 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_DHCP
#define CONFIG_CMD_PCI
#define CONFIG_CMD_IRQ
#define CONFIG_CMD_ELF
#define CONFIG_CMD_DATE
#define CONFIG_CMD_I2C
#define CONFIG_CMD_MII
#define CONFIG_CMD_PING
#define CONFIG_CMD_BSP
#define CONFIG_CMD_EEPROM
#undef CONFIG_WATCHDOG /* watchdog disabled */ #undef CONFIG_WATCHDOG /* watchdog disabled */
@ -120,7 +123,7 @@
#define CFG_PROMPT_HUSH_PS2 "> " #define CFG_PROMPT_HUSH_PS2 "> "
#endif #endif
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
#define CFG_CBSIZE 1024 /* Console I/O Buffer Size */ #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */
#else #else
#define CFG_CBSIZE 256 /* Console I/O Buffer Size */ #define CFG_CBSIZE 256 /* Console I/O Buffer Size */
@ -324,7 +327,7 @@
#define CFG_DCACHE_SIZE 16384 /* For AMCC 405 CPUs, older 405 ppc's */ #define CFG_DCACHE_SIZE 16384 /* For AMCC 405 CPUs, older 405 ppc's */
/* have only 8kB, 16kB is save here */ /* have only 8kB, 16kB is save here */
#define CFG_CACHELINE_SIZE 32 /* ... */ #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 */ #define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */
#endif #endif

View File

@ -228,31 +228,30 @@
#define CFG_CMD_POST_DIAG 0 #define CFG_CMD_POST_DIAG 0
#endif #endif
/* /*
* List of available monitor commands. Use the system default list * Command line configuration.
* plus add some of the "non-standard" commands back in.
* See ./cmd_confdefs.h
*/ */
#define BASE_CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ #include <config_cmd_default.h>
CFG_CMD_ASKENV | \
CFG_CMD_DHCP | \ #define CONFIG_CMD_ASKENV
CFG_CMD_I2C | \ #define CONFIG_CMD_DHCP
CFG_CMD_EEPROM | \ #define CONFIG_CMD_I2C
CFG_CMD_REGINFO | \ #define CONFIG_CMD_EEPROM
CFG_CMD_IMMAP | \ #define CONFIG_CMD_REGINFO
CFG_CMD_ELF | \ #define CONFIG_CMD_IMMAP
CFG_CMD_DATE | \ #define CONFIG_CMD_ELF
CFG_CMD_FPGA | \ #define CONFIG_CMD_DATE
CFG_CMD_MII | \ #define CONFIG_CMD_FPGA
CFG_CMD_BEDBUG | \ #define CONFIG_CMD_MII
CFG_CMD_POST_DIAG ) #define CONFIG_CMD_BEDBUG
#define CONFIG_CMD_POST_DIAG
#if !defined(CONFIG_SC) #if !defined(CONFIG_SC)
#define CONFIG_COMMANDS ( BASE_CONFIG_COMMANDS | CFG_CMD_DOC ) #define CONFIG_CMD_DOC
#else
#define CONFIG_COMMANDS BASE_CONFIG_COMMANDS
#endif #endif
/* /*
* There is no IDE/PCMCIA hardware support on the board. * There is no IDE/PCMCIA hardware support on the board.
*/ */
@ -279,11 +278,6 @@
#define CFG_FPGA_PROG_FEEDBACK #define CFG_FPGA_PROG_FEEDBACK
/************************************************************************
* This must be included AFTER the definition of any CONFIG_COMMANDS
*/
#include <cmd_confdefs.h>
#define CFG_NAND_LEGACY #define CFG_NAND_LEGACY
/* /*
@ -306,7 +300,7 @@
/* /*
* Set buffer size for console I/O * Set buffer size for console I/O
*/ */
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
#define CFG_CBSIZE 1024 #define CFG_CBSIZE 1024
#else #else
#define CFG_CBSIZE 256 #define CFG_CBSIZE 256
@ -471,7 +465,7 @@
* Cache Configuration * Cache Configuration
*/ */
#define CFG_CACHELINE_SIZE 16 /* For all MPC8xx CPUs */ #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 above value */ #define CFG_CACHELINE_SHIFT 4 /* log base 2 of above value */
#endif #endif

View File

@ -105,15 +105,19 @@
#undef CONFIG_WATCHDOG /* watchdog disabled */ #undef CONFIG_WATCHDOG /* watchdog disabled */
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h> /*
* Command line configuration.
*/
#include <config_cmd_default.h>
/* /*
* Miscellaneous configurable options * Miscellaneous configurable options
*/ */
#define CFG_LONGHELP /* undef to save memory */ #define CFG_LONGHELP /* undef to save memory */
#define CFG_PROMPT ":>" /* Monitor Command Prompt */ #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 */ #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */
#else #else
#define CFG_CBSIZE 256 /* Console I/O Buffer Size */ #define CFG_CBSIZE 256 /* Console I/O Buffer Size */
@ -193,7 +197,7 @@
* Cache Configuration * Cache Configuration
*/ */
#define CFG_CACHELINE_SIZE 16 /* For all MPC8xx CPUs */ #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 */ #define CFG_CACHELINE_SHIFT 4 /* log base 2 of the above value */
#endif #endif

View File

@ -97,18 +97,23 @@
#error Both CONFIG_SCC1_ENET and CONFIG_FEC_ENET configured #error Both CONFIG_SCC1_ENET and CONFIG_FEC_ENET configured
#endif #endif
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | CFG_CMD_IDE)
/*
* Command line configuration.
*/
#include <config_cmd_default.h>
#define CONFIG_CMD_IDE
#define CONFIG_MAC_PARTITION #define CONFIG_MAC_PARTITION
#define CONFIG_DOS_PARTITION #define CONFIG_DOS_PARTITION
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h>
/* /*
* Miscellaneous configurable options * Miscellaneous configurable options
*/ */
#define CFG_PROMPT "=>" /* Monitor Command Prompt */ #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 */ #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */
#else #else
#define CFG_CBSIZE 256 /* Console I/O Buffer Size */ #define CFG_CBSIZE 256 /* Console I/O Buffer Size */
@ -190,7 +195,7 @@
* Cache Configuration * Cache Configuration
*/ */
#define CFG_CACHELINE_SIZE 16 /* For all MPC8xx CPUs */ #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 */ #define CFG_CACHELINE_SHIFT 4 /* log base 2 of the above value */
#endif #endif