leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

include/configs: Use new CONFIG_CMD_* in various e* named board config files.

Browse Source 
Signed-off-by: Jon Loeliger <jdl@freescale.com>
This commit is contained in:
Jon Loeliger 2007-07-04 22:32:10 -05:00 committed by Wolfgang Denk
parent ab999ba1b3
commit 1bec3d3002
7 changed files with 128 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/configs/eXalion.h
View File

@ -58,17 +58,18 @@
/*#define CONFIG_DRAM_SPEED 66 */ /* MHz */ /*#define CONFIG_DRAM_SPEED 66 */ /* MHz */
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ /*
CFG_CMD_FLASH | \ * Command line configuration.
CFG_CMD_SDRAM | \ */
CFG_CMD_I2C | \ #include <config_cmd_default.h>
CFG_CMD_IDE | \
CFG_CMD_FAT | \
CFG_CMD_ENV | \
CFG_CMD_PCI )
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ #define CONFIG_CMD_FLASH
#include <cmd_confdefs.h> #define CONFIG_CMD_SDRAM
#define CONFIG_CMD_I2C
#define CONFIG_CMD_IDE
#define CONFIG_CMD_FAT
#define CONFIG_CMD_ENV
#define CONFIG_CMD_PCI
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
@ -398,7 +399,7 @@
* Cache Configuration * Cache Configuration
*/ */
#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

47
include/configs/ebony.h
View File

@ -208,26 +208,29 @@
#define CONFIG_NETCONSOLE /* include NetConsole support */ #define CONFIG_NETCONSOLE /* include NetConsole support */
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
CFG_CMD_ASKENV | \
CFG_CMD_DATE | \
CFG_CMD_DHCP | \
CFG_CMD_DIAG | \
CFG_CMD_ELF | \
CFG_CMD_EEPROM | \
CFG_CMD_I2C | \
CFG_CMD_IRQ | \
CFG_CMD_MII | \
CFG_CMD_NET | \
CFG_CMD_NFS | \
CFG_CMD_PCI | \
CFG_CMD_PING | \
CFG_CMD_REGINFO | \
CFG_CMD_SDRAM | \
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_DIAG
#define CONFIG_CMD_ELF
#define CONFIG_CMD_EEPROM
#define CONFIG_CMD_I2C
#define CONFIG_CMD_IRQ
#define CONFIG_CMD_MII
#define CONFIG_CMD_NET
#define CONFIG_CMD_NFS
#define CONFIG_CMD_PCI
#define CONFIG_CMD_PING
#define CONFIG_CMD_REGINFO
#define CONFIG_CMD_SDRAM
#define CONFIG_CMD_SNTP
#undef CONFIG_WATCHDOG /* watchdog disabled */ #undef CONFIG_WATCHDOG /* watchdog disabled */
@ -236,7 +239,7 @@
*/ */
#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 */
@ -286,7 +289,7 @@
*/ */
#define CFG_DCACHE_SIZE 8192 /* For AMCC 405 CPUs */ #define CFG_DCACHE_SIZE 8192 /* For AMCC 405 CPUs */
#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
@ -298,7 +301,7 @@
#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */
#define BOOTFLAG_WARM 0x02 /* Software reboot */ #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_BAUDRATE 230400 /* speed to run kgdb serial port */
#define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */
#endif #endif

12
include/configs/ep7312.h
View File

@ -64,10 +64,14 @@
#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT|CONFIG_BOOTP_BOOTFILESIZE) #define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT|CONFIG_BOOTP_BOOTFILESIZE)
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | CFG_CMD_JFFS2)
/* 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_JFFS2
#define CONFIG_BOOTDELAY 3 #define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTARGS "devfs=mount root=ramfs console=ttyS0,9600" #define CONFIG_BOOTARGS "devfs=mount root=ramfs console=ttyS0,9600"
@ -78,7 +82,7 @@
/*#define CONFIG_BOOTFILE "impa7" */ /*#define CONFIG_BOOTFILE "impa7" */
#define CONFIG_BOOTCOMMAND "bootp;bootm" #define CONFIG_BOOTCOMMAND "bootp;bootm"
#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_BAUDRATE 230400 /* speed to run kgdb serial port */
#define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */
#endif #endif

32
include/configs/ep8248.h
View File

@ -123,23 +123,25 @@
#define CONFIG_BAUDRATE 38400 #define CONFIG_BAUDRATE 38400
#define CONFIG_COMMANDS (CONFIG_CMD_DFL \
| CFG_CMD_DHCP \
| CFG_CMD_ECHO \
| CFG_CMD_I2C \
| CFG_CMD_IMMAP \
| CFG_CMD_MII \
| CFG_CMD_PING \
)
/* 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_ECHO
#define CONFIG_CMD_I2C
#define CONFIG_CMD_IMMAP
#define CONFIG_CMD_MII
#define CONFIG_CMD_PING
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_BOOTCOMMAND "bootm FF860000" /* autoboot command */ #define CONFIG_BOOTCOMMAND "bootm FF860000" /* autoboot command */
#define CONFIG_BOOTARGS "root=/dev/mtdblock1 rw mtdparts=phys:7M(root),-(root)ro" #define CONFIG_BOOTARGS "root=/dev/mtdblock1 rw mtdparts=phys:7M(root),-(root)ro"
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
#undef CONFIG_KGDB_ON_SMC /* define if kgdb on SMC */ #undef CONFIG_KGDB_ON_SMC /* define if kgdb on SMC */
#define CONFIG_KGDB_ON_SCC /* define if kgdb on SCC */ #define CONFIG_KGDB_ON_SCC /* define if kgdb on SCC */
#undef CONFIG_KGDB_NONE /* define if kgdb on something else */ #undef CONFIG_KGDB_NONE /* define if kgdb on something else */
@ -157,7 +159,7 @@
#define CFG_PROMPT_HUSH_PS2 "> " #define CFG_PROMPT_HUSH_PS2 "> "
#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 */
@ -183,7 +185,7 @@
#define CFG_DIRECT_FLASH_TFTP #define CFG_DIRECT_FLASH_TFTP
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) #if defined(CONFIG_CMD_JFFS2)
#define CFG_JFFS2_FIRST_BANK 0 #define CFG_JFFS2_FIRST_BANK 0
#define CFG_JFFS2_NUM_BANKS CFG_MAX_FLASH_BANKS #define CFG_JFFS2_NUM_BANKS CFG_MAX_FLASH_BANKS
#define CFG_JFFS2_FIRST_SECTOR 0 #define CFG_JFFS2_FIRST_SECTOR 0
@ -192,7 +194,7 @@
#define CFG_JFFS_CUSTOM_PART #define CFG_JFFS_CUSTOM_PART
#endif /* CFG_CMD_JFFS2 */ #endif /* CFG_CMD_JFFS2 */
#if (CONFIG_COMMANDS & CFG_CMD_I2C) #if defined(CONFIG_CMD_I2C)
#define CONFIG_HARD_I2C 1 /* To enable I2C support */ #define CONFIG_HARD_I2C 1 /* To enable I2C support */
#define CFG_I2C_SPEED 100000 /* I2C speed */ #define CFG_I2C_SPEED 100000 /* I2C speed */
#define CFG_I2C_SLAVE 0x7F /* I2C slave address */ #define CFG_I2C_SLAVE 0x7F /* I2C slave address */
@ -240,7 +242,7 @@
#define CFG_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */ #define CFG_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
#define CFG_CACHELINE_SIZE 32 /* For MPC8260 CPUs */ #define CFG_CACHELINE_SIZE 32 /* For MPC8260 CPUs */
#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

69
include/configs/ep8260.h
View File

@ -291,37 +291,39 @@
#define CFG_HUSH_PARSER #define CFG_HUSH_PARSER
#define CFG_PROMPT_HUSH_PS2 "> " #define CFG_PROMPT_HUSH_PS2 "> "
/* What U-Boot subsytems do you want enabled? */
/* /*
*/ * Command line configuration.
#define CONFIG_COMMANDS ( CFG_CMD_ALL & \ */
~( CFG_CMD_BMP | \ #include <config_cmd_all.h>
CFG_CMD_BSP | \
CFG_CMD_DCR | \ #undef CONFIG_CMD_BMP
CFG_CMD_DHCP | \ #undef CONFIG_CMD_BSP
CFG_CMD_DISPLAY | \ #undef CONFIG_CMD_DCR
CFG_CMD_DOC | \ #undef CONFIG_CMD_DHCP
CFG_CMD_DTT | \ #undef CONFIG_CMD_DISPLAY
CFG_CMD_EEPROM | \ #undef CONFIG_CMD_DOC
CFG_CMD_EXT2 | \ #undef CONFIG_CMD_DTT
CFG_CMD_FDC | \ #undef CONFIG_CMD_EEPROM
CFG_CMD_FDOS | \ #undef CONFIG_CMD_EXT2
CFG_CMD_HWFLOW | \ #undef CONFIG_CMD_FDC
CFG_CMD_IDE | \ #undef CONFIG_CMD_FDOS
CFG_CMD_JFFS2 | \ #undef CONFIG_CMD_HWFLOW
CFG_CMD_KGDB | \ #undef CONFIG_CMD_IDE
CFG_CMD_MII | \ #undef CONFIG_CMD_JFFS2
CFG_CMD_MMC | \ #undef CONFIG_CMD_KGDB
CFG_CMD_NAND | \ #undef CONFIG_CMD_MII
CFG_CMD_PCI | \ #undef CONFIG_CMD_MMC
CFG_CMD_PCMCIA | \ #undef CONFIG_CMD_NAND
CFG_CMD_REISER | \ #undef CONFIG_CMD_PCI
CFG_CMD_SCSI | \ #undef CONFIG_CMD_PCMCIA
CFG_CMD_SPI | \ #undef CONFIG_CMD_REISER
CFG_CMD_UNIVERSE| \ #undef CONFIG_CMD_SCSI
CFG_CMD_USB | \ #undef CONFIG_CMD_SPI
CFG_CMD_VFD | \ #undef CONFIG_CMD_UNIVERSE
CFG_CMD_XIMG ) ) #undef CONFIG_CMD_USB
#undef CONFIG_CMD_VFD
#undef CONFIG_CMD_XIMG
/* Where do the internal registers live? */ /* Where do the internal registers live? */
@ -342,13 +344,10 @@
#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */ #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h>
/* /*
* Miscellaneous configurable options * Miscellaneous configurable options
*/ */
#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 */
@ -496,7 +495,7 @@
*/ */
#define CFG_CACHELINE_SIZE 32 /* For MPC8260 CPU */ #define CFG_CACHELINE_SIZE 32 /* For MPC8260 CPU */
#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

43
include/configs/ep82xxm.h
View File

@ -108,22 +108,25 @@
#define CFG_VXWORKS_MAC_PTR 0x4300 /* Pass Ethernet MAC to VxWorks */ #define CFG_VXWORKS_MAC_PTR 0x4300 /* Pass Ethernet MAC to VxWorks */
#define CONFIG_COMMANDS (CONFIG_CMD_DFL \
| CFG_CMD_DHCP \
| CFG_CMD_ECHO \
| CFG_CMD_I2C \
| CFG_CMD_IMMAP \
| CFG_CMD_MII \
| CFG_CMD_PING \
| CFG_CMD_DATE \
| CFG_CMD_DTT \
| CFG_CMD_EEPROM \
| CFG_CMD_PCI \
| CFG_CMD_DIAG \
)
/* 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_ECHO
#define CONFIG_CMD_I2C
#define CONFIG_CMD_IMMAP
#define CONFIG_CMD_MII
#define CONFIG_CMD_PING
#define CONFIG_CMD_DATE
#define CONFIG_CMD_DTT
#define CONFIG_CMD_EEPROM
#define CONFIG_CMD_PCI
#define CONFIG_CMD_DIAG
#define CONFIG_ETHADDR 00:10:EC:00:88:65 #define CONFIG_ETHADDR 00:10:EC:00:88:65
#define CONFIG_HAS_ETH1 #define CONFIG_HAS_ETH1
@ -138,7 +141,7 @@
#define CONFIG_AUTO_COMPLETE 1 #define CONFIG_AUTO_COMPLETE 1
#define CONFIG_EXTRA_ENV_SETTINGS "ethprime=FCC3 ETHERNET" #define CONFIG_EXTRA_ENV_SETTINGS "ethprime=FCC3 ETHERNET"
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
#undef CONFIG_KGDB_ON_SMC /* define if kgdb on SMC */ #undef CONFIG_KGDB_ON_SMC /* define if kgdb on SMC */
#define CONFIG_KGDB_ON_SCC /* define if kgdb on SCC */ #define CONFIG_KGDB_ON_SCC /* define if kgdb on SCC */
#undef CONFIG_KGDB_NONE /* define if kgdb on something else */ #undef CONFIG_KGDB_NONE /* define if kgdb on something else */
@ -156,7 +159,7 @@
#define CFG_PROMPT_HUSH_PS2 "> " #define CFG_PROMPT_HUSH_PS2 "> "
#define CFG_LONGHELP /* undef to save memory */ #define CFG_LONGHELP /* undef to save memory */
#define CFG_PROMPT "ep82xxm=> " /* Monitor Command Prompt */ #define CFG_PROMPT "ep82xxm=> " /* 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 */
@ -308,7 +311,7 @@
#define CFG_DIRECT_FLASH_TFTP #define CFG_DIRECT_FLASH_TFTP
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) #if defined(CONFIG_CMD_JFFS2)
#define CFG_JFFS2_FIRST_BANK 0 #define CFG_JFFS2_FIRST_BANK 0
#define CFG_JFFS2_NUM_BANKS CFG_MAX_FLASH_BANKS #define CFG_JFFS2_NUM_BANKS CFG_MAX_FLASH_BANKS
#define CFG_JFFS2_FIRST_SECTOR 0 #define CFG_JFFS2_FIRST_SECTOR 0
@ -317,7 +320,7 @@
#define CFG_JFFS_CUSTOM_PART #define CFG_JFFS_CUSTOM_PART
#endif /* CFG_CMD_JFFS2 */ #endif /* CFG_CMD_JFFS2 */
#if (CONFIG_COMMANDS & CFG_CMD_I2C) #if defined(CONFIG_CMD_I2C)
#define CONFIG_HARD_I2C 1 /* To enable I2C support */ #define CONFIG_HARD_I2C 1 /* To enable I2C support */
#define CFG_I2C_SPEED 100000 /* I2C speed */ #define CFG_I2C_SPEED 100000 /* I2C speed */
#define CFG_I2C_SLAVE 0x7F /* I2C slave address */ #define CFG_I2C_SLAVE 0x7F /* I2C slave address */
@ -358,7 +361,7 @@
#define CFG_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */ #define CFG_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
#define CFG_CACHELINE_SIZE 32 /* For MPC8260 CPUs */ #define CFG_CACHELINE_SIZE 32 /* For MPC8260 CPUs */
#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

13
include/configs/evb4510.h
View File

@ -74,10 +74,15 @@
#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT|CONFIG_BOOTP_BOOTFILESIZE) #define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT|CONFIG_BOOTP_BOOTFILESIZE)
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | CFG_CMD_PING)
/* 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_PING
#define CONFIG_ETHADDR 00:40:95:36:35:33 #define CONFIG_ETHADDR 00:40:95:36:35:33
#define CONFIG_NETMASK 255.255.255.0 #define CONFIG_NETMASK 255.255.255.0
@ -89,7 +94,7 @@
#define CONFIG_BOOTCOMMAND "tftp 100000 uImage" #define CONFIG_BOOTCOMMAND "tftp 100000 uImage"
/* #define CONFIG_BOOTARGS "console=ttyS0,19200 initrd=0x100a0040,530K root=/dev/ram keepinitrd" */ /* #define CONFIG_BOOTARGS "console=ttyS0,19200 initrd=0x100a0040,530K root=/dev/ram keepinitrd" */
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
#define CONFIG_KGDB_BAUDRATE 19200 /* speed to run kgdb serial port */ #define CONFIG_KGDB_BAUDRATE 19200 /* speed to run kgdb serial port */
#define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */
#endif #endif