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

include/configs: Use new CONFIG_CMD_* in various d* 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:03 -05:00 committed by Wolfgang Denk
parent 37e4f24b87
commit ab999ba1b3
4 changed files with 84 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
include/configs/dbau1x00.h
View File

@ -75,21 +75,48 @@
#ifdef CONFIG_DBAU1550 #ifdef CONFIG_DBAU1550
/* Boot from flash by default, revert to bootp */ /* Boot from flash by default, revert to bootp */
#define CONFIG_BOOTCOMMAND "bootm 0xbfc20000; bootp; bootm" #define CONFIG_BOOTCOMMAND "bootm 0xbfc20000; bootp; bootm"
#define CONFIG_COMMANDS ((CONFIG_CMD_DFL | CFG_CMD_FLASH | CFG_CMD_LOADB | CFG_CMD_NET) & \
~(CFG_CMD_ENV | CFG_CMD_FAT | CFG_CMD_FPGA | CFG_CMD_IDE | \
CFG_CMD_MII | CFG_CMD_RUN | CFG_CMD_BDI | CFG_CMD_BEDBUG | \
CFG_CMD_NFS | CFG_CMD_ELF | CFG_CMD_PCMCIA | CFG_CMD_I2C))
#else /* CONFIG_DBAU1550 */ #else /* CONFIG_DBAU1550 */
#define CONFIG_BOOTCOMMAND "bootp;bootm" #define CONFIG_BOOTCOMMAND "bootp;bootm"
#define CONFIG_COMMANDS ((CONFIG_CMD_DFL | CFG_CMD_IDE | CFG_CMD_DHCP | CFG_CMD_ELF) & \
~(CFG_CMD_ENV | CFG_CMD_FAT | CFG_CMD_FLASH | CFG_CMD_FPGA | \
CFG_CMD_MII | CFG_CMD_LOADS | CFG_CMD_RUN | CFG_CMD_LOADB | \
CFG_CMD_ELF | CFG_CMD_BDI | CFG_CMD_BEDBUG))
#endif /* CONFIG_DBAU1550 */ #endif /* CONFIG_DBAU1550 */
#include <cmd_confdefs.h>
/*
* Command line configuration.
*/
#include <config_cmd_default.h>
#undef CONFIG_CMD_BDI
#undef CONFIG_CMD_BEDBUG
#undef CONFIG_CMD_ELF
#undef CONFIG_CMD_ENV
#undef CONFIG_CMD_FAT
#undef CONFIG_CMD_FPGA
#undef CONFIG_CMD_MII
#undef CONFIG_CMD_RUN
#ifdef CONFIG_DBAU1550
#define CONFIG_CMD_FLASH
#define CONFIG_CMD_LOADB
#define CONFIG_CMD_NET
#undef CONFIG_CMD_I2C
#undef CONFIG_CMD_IDE
#undef CONFIG_CMD_NFS
#undef CONFIG_CMD_PCMCIA
#else
#define CONFIG_CMD_IDE
#define CONFIG_CMD_DHCP
#undef CONFIG_CMD_FLASH
#undef CONFIG_CMD_LOADB
#undef CONFIG_CMD_LOADS
#endif
/* /*
* Miscellaneous configurable options * Miscellaneous configurable options

39
include/configs/debris.h
View File

@ -122,23 +122,26 @@
#define CONFIG_BAUDRATE 9600 #define CONFIG_BAUDRATE 9600
#define CONFIG_DRAM_SPEED 100 /* MHz */ #define CONFIG_DRAM_SPEED 100 /* MHz */
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
CFG_CMD_ASKENV | \ /*
CFG_CMD_CACHE | \ * Command line configuration.
CFG_CMD_DATE | \ */
CFG_CMD_DHCP | \ #include <config_cmd_default.h>
CFG_CMD_DIAG | \
CFG_CMD_EEPROM | \ #define CONFIG_CMD_ASKENV
CFG_CMD_ELF | \ #define CONFIG_CMD_CACHE
CFG_CMD_I2C | \ #define CONFIG_CMD_DATE
CFG_CMD_JFFS2 | \ #define CONFIG_CMD_DHCP
CFG_CMD_KGBD | \ #define CONFIG_CMD_DIAG
CFG_CMD_PCI | \ #define CONFIG_CMD_EEPROM
CFG_CMD_PING | \ #define CONFIG_CMD_ELF
CFG_CMD_SAVES | \ #define CONFIG_CMD_I2C
CFG_CMD_SDRAM) #define CONFIG_CMD_JFFS2
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ #define CONFIG_CMD_KGBD
#include <cmd_confdefs.h> #define CONFIG_CMD_PCI
#define CONFIG_CMD_PING
#define CONFIG_CMD_SAVES
#define CONFIG_CMD_SDRAM
/* /*
@ -435,7 +438,7 @@
* Cache Configuration * Cache Configuration
*/ */
#define CFG_CACHELINE_SIZE 32 /* For MPC8240 CPU */ #define CFG_CACHELINE_SIZE 32 /* For MPC8240 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

32
include/configs/delta.h
View File

@ -87,23 +87,29 @@
#define CONFIG_BAUDRATE 115200 #define CONFIG_BAUDRATE 115200
/* #define CONFIG_COMMANDS (CONFIG_CMD_DFL | CFG_CMD_MMC | CFG_CMD_FAT) */
/*
* Command line configuration.
*/
#include <config_cmd_default.h>
#ifdef TURN_ON_ETHERNET #ifdef TURN_ON_ETHERNET
# define CONFIG_COMMANDS (CONFIG_CMD_DFL | CFG_CMD_PING)
#define CONFIG_CMD_PING
#else #else
# define CONFIG_COMMANDS ((CONFIG_CMD_DFL \
| CFG_CMD_ENV \ #define CONFIG_CMD_ENV
| CFG_CMD_NAND \ #define CONFIG_CMD_NAND
| CFG_CMD_I2C) \ #define CONFIG_CMD_I2C
& ~(CFG_CMD_NET \
| CFG_CMD_FLASH \ #undef CONFIG_CMD_NET
| CFG_CMD_IMLS)) #undef CONFIG_CMD_FLASH
#undef CONFIG_CMD_IMLS
#endif #endif
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h>
#define CONFIG_BOOTDELAY -1 #define CONFIG_BOOTDELAY -1
#define CONFIG_ETHADDR 08:00:3e:26:0a:5b #define CONFIG_ETHADDR 08:00:3e:26:0a:5b
#define CONFIG_NETMASK 255.255.0.0 #define CONFIG_NETMASK 255.255.0.0
@ -114,7 +120,7 @@
#define CONFIG_CMDLINE_TAG #define CONFIG_CMDLINE_TAG
#define CONFIG_TIMESTAMP #define CONFIG_TIMESTAMP
#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

10
include/configs/dnp1110.h
View File

@ -66,10 +66,12 @@
#define CONFIG_BAUDRATE 115200 #define CONFIG_BAUDRATE 115200
#define CONFIG_COMMANDS (CONFIG_CMD_DFL)
/* 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_BOOTDELAY 3 #define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTARGS "root=ramfs devfs=mount console=ttySA0,115200" #define CONFIG_BOOTARGS "root=ramfs devfs=mount console=ttySA0,115200"
@ -80,7 +82,7 @@
#define CONFIG_BOOTFILE "dnp1110" #define CONFIG_BOOTFILE "dnp1110"
#define CONFIG_BOOTCOMMAND "tftp; bootm" #define CONFIG_BOOTCOMMAND "tftp; 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