Skip to content
Snippets Groups Projects
Commit 72eb0efa authored by Jon Loeliger's avatar Jon Loeliger Committed by Wolfgang Denk
Browse files

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


Signed-off-by: default avatarJon Loeliger <jdl@freescale.com>
parent 1bec3d30
No related branches found
No related tags found
No related merge requests found
...@@ -83,7 +83,6 @@ ...@@ -83,7 +83,6 @@
#define CONFIG_CMD_PING #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
#define CONFIG_IPADDR 10.0.0.11 #define CONFIG_IPADDR 10.0.0.11
......
...@@ -79,18 +79,23 @@ ...@@ -79,18 +79,23 @@
#define CONFIG_BAUDRATE 38400 #define CONFIG_BAUDRATE 38400
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | CFG_CMD_DHCP)
#define CONFIG_BOOTP_MASK CONFIG_BOOTP_DEFAULT
/* 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_BOOTP_MASK CONFIG_BOOTP_DEFAULT
#define CONFIG_BOOTDELAY 3 #define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTARGS "console=ttySA0,38400n8 mtdparts=sa1100-flash:1m@0(zImage),3m@1m(ramdisk.gz),12m@4m(userfs) root=/dev/nfs ip=bootp" #define CONFIG_BOOTARGS "console=ttySA0,38400n8 mtdparts=sa1100-flash:1m@0(zImage),3m@1m(ramdisk.gz),12m@4m(userfs) root=/dev/nfs ip=bootp"
#define CONFIG_BOOTCOMMAND "bootp;tftp;bootm" #define CONFIG_BOOTCOMMAND "bootp;tftp;bootm"
#define CFG_AUTOLOAD "n" /* No autoload */ #define CFG_AUTOLOAD "n" /* No autoload */
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
#define CONFIG_KGDB_BAUDRATE 38400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_BAUDRATE 38400 /* 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
......
...@@ -71,12 +71,28 @@ ...@@ -71,12 +71,28 @@
/* Boot from Compact flash partition 2 as default */ /* Boot from Compact flash partition 2 as default */
#define CONFIG_BOOTCOMMAND "ide reset;disk 0x81000000 0:2;run addmisc;bootm" #define CONFIG_BOOTCOMMAND "ide reset;disk 0x81000000 0:2;run addmisc;bootm"
#define CONFIG_COMMANDS ((CONFIG_CMD_DFL | CFG_CMD_IDE | CFG_CMD_DHCP ) & \
~(CFG_CMD_ENV | CFG_CMD_FAT | CFG_CMD_FLASH | CFG_CMD_FPGA | \
CFG_CMD_MII | CFG_CMD_LOADS | CFG_CMD_LOADB | CFG_CMD_ELF | \
CFG_CMD_BDI | CFG_CMD_BEDBUG | CFG_CMD_NFS | CFG_CMD_AUTOSCRIPT ))
#include <cmd_confdefs.h> /*
* Command line configuration.
*/
#include <config_cmd_default.h>
#define CONFIG_CMD_IDE
#define CONFIG_CMD_DHCP
#undef CONFIG_CMD_ENV
#undef CONFIG_CMD_FAT
#undef CONFIG_CMD_FLASH
#undef CONFIG_CMD_FPGA
#undef CONFIG_CMD_MII
#undef CONFIG_CMD_LOADS
#undef CONFIG_CMD_LOADB
#undef CONFIG_CMD_ELF
#undef CONFIG_CMD_BDI
#undef CONFIG_CMD_BEDBUG
#undef CONFIG_CMD_NFS
#undef CONFIG_CMD_AUTOSCRIPT
/* /*
* Miscellaneous configurable options * Miscellaneous configurable options
......
...@@ -300,14 +300,21 @@ ...@@ -300,14 +300,21 @@
/* Monitor Command Prompt */ /* Monitor Command Prompt */
#define CFG_PROMPT "=> " #define CFG_PROMPT "=> "
/* What U-Boot subsytems do you want enabled? */
#define CONFIG_COMMANDS (((CONFIG_CMD_DFL & ~(CFG_CMD_KGDB))) | \ /*
CFG_CMD_BEDBUG | \ * Command line configuration.
CFG_CMD_ELF | \ */
CFG_CMD_ASKENV | \ #include <config_cmd_default.h>
CFG_CMD_REGINFO | \
CFG_CMD_IMMAP | \ #define CONFIG_CMD_BEDBUG
CFG_CMD_MII) #define CONFIG_CMD_ELF
#define CONFIG_CMD_ASKENV
#define CONFIG_CMD_REGINFO
#define CONFIG_CMD_IMMAP
#define CONFIG_CMD_MII
#undef CONFIG_CMD_KGDB
/* Where do the internal registers live? */ /* Where do the internal registers live? */
#define CFG_IMMR 0xf0000000 #define CFG_IMMR 0xf0000000
...@@ -331,13 +338,10 @@ ...@@ -331,13 +338,10 @@
#define CONFIG_GW8260 1 /* on an GW8260 Board */ #define CONFIG_GW8260 1 /* on an GW8260 Board */
#define CONFIG_CPM2 1 /* Has a CPM2 */ #define CONFIG_CPM2 1 /* Has a CPM2 */
/* 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 */
...@@ -473,7 +477,7 @@ ...@@ -473,7 +477,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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment