include/configs: Use new CONFIG_CMD_* in various c* named board config files.
PATCH 10/25 include/configs: Use new CONFIG_CMD_* in various c* named board config files.
Signed-off-by Jon Loeliger <[email protected]>
--- include/configs/c2mon.h | 23 +++++++++++--------- include/configs/canmb.h | 38 +++++++++++++++++----------------- include/configs/cerf250.h | 10 +++++--- include/configs/cm4008.h | 12 +++++++--- include/configs/cm41xx.h | 12 +++++++--- include/configs/cmc_pu2.h | 42 +++++++++++++++++++------------------- include/configs/cobra5272.h | 18 +++++++++------- include/configs/cogent_mpc8260.h | 18 ++++++++++----- include/configs/cogent_mpc8xx.h | 18 ++++++++++----- include/configs/cradle.h | 8 ++++-- include/configs/csb226.h | 23 +++++++++++++++++--- include/configs/csb272.h | 36 ++++++++++++++++---------------- include/configs/csb472.h | 37 +++++++++++++++++---------------- include/configs/csb637.h | 31 +++++++++++++++------------ 14 files changed, 187 insertions(+), 139 deletions(-)
include/configs/c2mon.h +13 -10
@@ -77,15 +77,18 @@#define CONFIG_RTC_MPC8xx/* use internal RTC of MPC8xx */ -#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ - CFG_CMD_DATE | \ - CFG_CMD_DHCP | \ - CFG_CMD_IDE | \ - 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_DATE +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_IDE +#define CONFIG_CMD_NFS +#define CONFIG_CMD_SNTP +/* * Miscellaneous configurable options
@@ -98,7 +101,7 @@#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 */
@@ -174,7 +177,7 @@* Cache Configuration */ #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 */ #endif
include/configs/canmb.h +19 -19
@@ -38,11 +38,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 -#define CONFIG_BOARD_EARLY_INIT_R /*
@@ -52,21 +47,21 @@#define CONFIG_BAUDRATE 115200/* ... at 115200 bps */ #define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } +/* -* Supported commands +* Command line configuration. */ -#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ - CFG_CMD_ASKENV | \ - CFG_CMD_DATE | \ - CFG_CMD_DHCP | \ - CFG_CMD_IMMAP | \ - CFG_CMD_MII | \ - CFG_CMD_NFS | \ - CFG_CMD_REGINFO | \ - CFG_CMD_SNTP ) - -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -#include <cmd_confdefs.h> +#include <config_cmd_default.h> + +#define CONFIG_CMD_ASKENV +#define CONFIG_CMD_DATE +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_IMMAP +#define CONFIG_CMD_MII +#define CONFIG_CMD_NFS +#define CONFIG_CMD_REGINFO +#define CONFIG_CMD_SNTP +/* * MUST be low boot - HIGHBOOT is not supported anymore
@@ -181,7 +176,7 @@*/ #define CFG_LONGHELP /* undef to save memory */ #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 */ #else # define CFG_CBSIZE 256/* Console I/O Buffer Size */
@@ -199,6 +194,11 @@#define CONFIG_RTC_MPC5200 1/* use internal MPC5200 RTC */ +#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/cerf250.h +6 -4
@@ -61,10 +61,12 @@/* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#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_ETHADDR 00:D0:CA:F1:3C:D2
@@ -75,7 +77,7 @@#define CONFIG_BOOTARGS "root=/dev/mtdblock3 rootfstype=jffs2 console=ttyS0,38400"#define CONFIG_CMDLINE_TAG -#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_SER_INDEX 2/* which serial port to use */ #endif
include/configs/cm4008.h +8 -4
@@ -58,10 +58,14 @@#define CONFIG_BAUDRATE 115200#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -#include <cmd_confdefs.h> -#undef CONFIG_COMMANDS -#define CONFIG_COMMANDS (CONFIG_CMD_DFL & ~(CFG_CMD_NONSTD | CFG_CMD_ENV)) + +/* +* Command line configuration. +*/ +#include <config_cmd_default.h> + +#undef CONFIG_CMD_ENV +#define CONFIG_BOOTDELAY 0#define CONFIG_BOOTARGS "mem=16M console=ttyAM0,115200"
include/configs/cm41xx.h +8 -4
@@ -58,10 +58,14 @@#define CONFIG_BAUDRATE 115200#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -#include <cmd_confdefs.h> -#undef CONFIG_COMMANDS -#define CONFIG_COMMANDS (CONFIG_CMD_DFL & ~(CFG_CMD_NONSTD | CFG_CMD_ENV)) + +/* +* Command line configuration. +*/ +#include <config_cmd_default.h> + +#undef CONFIG_CMD_ENV +#define CONFIG_BOOTDELAY 0#define CONFIG_BOOTARGS "mem=32M console=ttyAM0,115200"
include/configs/cmc_pu2.h +21 -21
56 lines not on this page · raw message
include/configs/cobra5272.h +10 -8
@@ -130,16 +130,18 @@#define CFG_ENV_IS_IN_FLASH 1#endif -/* --- -* Define which commmands should be available@u-boot command prompt -* --- + +/* +* Command line configuration. */ +#include <config_cmd_default.h> + +#define CONFIG_CMD_PING -#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | CFG_CMD_PING & ~(CFG_CMD_LOADS | \ -CFG_CMD_LOADB) | CFG_CMD_MII) +#undef CONFIG_CMD_LOADS +#undef CONFIG_CMD_LOADB +#undef CONFIG_CMD_MII -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -#include <cmd_confdefs.h> /* *-----------------------------------------------------------------------------
@@ -184,7 +186,7 @@ from which user programs will be started */#define CFG_LONGHELP /* undef to save memory */ -#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 */
include/configs/cogent_mpc8260.h +12 -6
@@ -88,10 +88,16 @@#define CONFIG_BAUDRATE 9600#endif -#define CONFIG_COMMANDS ((CONFIG_CMD_DFL|CFG_CMD_KGDB)&~CFG_CMD_NET) -/* 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_KGDB + +#undef CONFIG_CMD_NET +#ifdef DEBUG #define CONFIG_BOOTDELAY -1/* autoboot disabled */
@@ -102,7 +108,7 @@#define CONFIG_BOOTARGS "root=/dev/ram rw" -#if (CONFIG_COMMANDS &CFG_CMD_KGDB ) +#if defined(CONFIG_CMD_KGDB )#define CONFIG_KGDB_ON_SMC /* define if kgdb on SMC */ #undef CONFIG_KGDB_ON_SCC/* define if kgdb on SCC */ #undef CONFIG_KGDB_NONE/* define if kgdb on something else */
@@ -124,7 +130,7 @@*/ #define CFG_LONGHELP /* undef to save memory */ #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 */ #else #define CFG_CBSIZE 256/* Console I/O Buffer Size */
@@ -256,7 +262,7 @@* Cache Configuration */ #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*/ #endif
include/configs/cogent_mpc8xx.h +12 -6
@@ -59,10 +59,16 @@#define CFG_I2C_SLAVE 0x7F -#define CONFIG_COMMANDS ((CONFIG_CMD_DFL | CFG_CMD_KGDB | CFG_CMD_I2C) & ~CFG_CMD_NET) +/* +* Command line configuration. +*/ +#include <config_cmd_default.h> + +#define CONFIG_CMD_KGDB +#define CONFIG_CMD_I2C + +#undef CONFIG_CMD_NET -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -#include <cmd_confdefs.h> #if 0 #define CONFIG_BOOTDELAY -1/* autoboot disabled */
@@ -73,7 +79,7 @@#define CONFIG_BOOTARGS "root=/dev/ram rw" -#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_SCC/* define if kgdb on SCC */ #define CONFIG_KGDB_NONE /* define if kgdb on something else */
@@ -88,7 +94,7 @@*/ #define CFG_LONGHELP /* undef to save memory */ #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 */ #else #define CFG_CBSIZE 256/* Console I/O Buffer Size */
@@ -200,7 +206,7 @@* Cache Configuration */ #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 */ #endif
include/configs/cradle.h +5 -3
@@ -61,10 +61,12 @@#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_BOOTARGS "root=/dev/mtdblock2 console=ttyS0,115200"
include/configs/csb226.h +19 -4
@@ -57,10 +57,25 @@#define CONFIG_BAUDRATE 19200#undef CONFIG_MISC_INIT_R/* not used yet */ -#define CONFIG_COMMANDS (CFG_CMD_BDI|CFG_CMD_LOADB|CFG_CMD_IMI|CFG_CMD_FLASH|CFG_CMD_MEMORY|CFG_CMD_NET|CFG_CMD_ENV|CFG_CMD_RUN|CFG_CMD_ASKENV|CFG_CMD_ECHO|CFG_CMD_DHCP|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> + +#define CONFIG_CMD_BDI +#define CONFIG_CMD_LOADB +#define CONFIG_CMD_IMI +#define CONFIG_CMD_FLASH +#define CONFIG_CMD_MEMORY +#define CONFIG_CMD_NET +#define CONFIG_CMD_ENV +#define CONFIG_CMD_RUN +#define CONFIG_CMD_ASKENV +#define CONFIG_CMD_ECHO +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_CACHE +#define CONFIG_BOOTDELAY 3#define CONFIG_BOOTARGS "console=ttyS0,19200 ip=192.168.1.10,192.168.1.5,,255,255,255,0,csb root=/dev/nfs, ether=0,0x08000000,eth0"
@@ -73,7 +88,7 @@#define CONFIG_CMDLINE_TAG 1 -#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_SER_INDEX 2/* which serial port to use */ #endif
include/configs/csb272.h +18 -18
@@ -79,24 +79,24 @@#define CONFIG_BOOTP_MASK ( CONFIG_BOOTP_DEFAULT | \ CONFIG_BOOTP_DNS2 | \ CONFIG_BOOTP_BOOTFILESIZE ) + +/* -* U-Boot Monitor Command Line Functions Configuration -* +* Command line configuration. */ -#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ - CFG_CMD_ASKENV | \ - CFG_CMD_BEDBUG | \ - CFG_CMD_ELF | \ - CFG_CMD_IRQ | \ - CFG_CMD_I2C | \ - CFG_CMD_PCI | \ - CFG_CMD_DATE | \ - CFG_CMD_MII | \ - CFG_CMD_PING | \ - CFG_CMD_DHCP ) - -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -#include <cmd_confdefs.h> +#include <config_cmd_default.h> + +#define CONFIG_CMD_ASKENV +#define CONFIG_CMD_BEDBUG +#define CONFIG_CMD_ELF +#define CONFIG_CMD_IRQ +#define CONFIG_CMD_I2C +#define CONFIG_CMD_PCI +#define CONFIG_CMD_DATE +#define CONFIG_CMD_MII +#define CONFIG_CMD_PING +#define CONFIG_CMD_DHCP +/* * Serial download configuration
@@ -109,7 +109,7 @@* KGDB Configuration * */ -#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_SER_INDEX 2/* which serial port to use */ #endif
@@ -125,7 +125,7 @@#define CFG_LONGHELP /* undef to save memory */ #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 */ #else #define CFG_CBSIZE 256/* Console I/O Buffer Size */
include/configs/csb472.h +19 -18
@@ -79,24 +79,25 @@#define CONFIG_BOOTP_MASK ( CONFIG_BOOTP_DEFAULT | \ CONFIG_BOOTP_DNS2 | \ CONFIG_BOOTP_BOOTFILESIZE ) + + +/* -* U-Boot Monitor Command Line Functions Configuration -* +* Command line configuration. */ -#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ - CFG_CMD_ASKENV | \ - CFG_CMD_BEDBUG | \ - CFG_CMD_ELF | \ - CFG_CMD_IRQ | \ - CFG_CMD_I2C | \ - CFG_CMD_PCI | \ - CFG_CMD_DATE | \ - CFG_CMD_MII | \ - CFG_CMD_PING | \ - CFG_CMD_DHCP ) - -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -#include <cmd_confdefs.h> +#include <config_cmd_default.h> + +#define CONFIG_CMD_ASKENV +#define CONFIG_CMD_BEDBUG +#define CONFIG_CMD_ELF +#define CONFIG_CMD_IRQ +#define CONFIG_CMD_I2C +#define CONFIG_CMD_PCI +#define CONFIG_CMD_DATE +#define CONFIG_CMD_MII +#define CONFIG_CMD_PING +#define CONFIG_CMD_DHCP +/* * Serial download configuration
@@ -109,7 +110,7 @@* KGDB Configuration * */ -#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_SER_INDEX 2/* which serial port to use */ #endif
@@ -125,7 +126,7 @@#define CFG_LONGHELP /* undef to save memory */ #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 */ #else #define CFG_CBSIZE 256/* Console I/O Buffer Size */
include/configs/csb637.h +17 -14
@@ -99,20 +99,23 @@#define CONFIG_BOOTDELAY 3/* #define CONFIG_ENV_OVERWRITE 1 */ -#define CONFIG_COMMANDS \ - ((CONFIG_CMD_DFL | \ - CFG_CMD_JFFS2 | \ - CFG_CMD_DHCP | \ - CFG_CMD_PING ) & \ - ~(CFG_CMD_BDI | \ - CFG_CMD_IMI | \ - CFG_CMD_AUTOSCRIPT | \ - CFG_CMD_FPGA | \ - CFG_CMD_MISC | \ - CFG_CMD_LOADS )) - -/* 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_CMD_DHCP +#define CONFIG_CMD_PING + +#undef CONFIG_CMD_BDI +#undef CONFIG_CMD_IMI +#undef CONFIG_CMD_AUTOSCRIPT +#undef CONFIG_CMD_FPGA +#undef CONFIG_CMD_MISC +#undef CONFIG_CMD_LOADS +#define CFG_MAX_NAND_DEVICE 1/* Max number of NAND devices */ #define SECTORSIZE 512
Signature · 1 line
1.5.2.2.249.g45fd