include/configs: Use new CONFIG_CMD_* in various E* named board config files.
PATCH 5/18 include/configs: Use new CONFIG_CMD_* in various E* named board config files.
Signed-off-by Jon Loeliger <[email protected]>
--- include/configs/EB+MCF-EV123.h | 13 ++++++++----- include/configs/ELPPC.h | 15 ++++++++++----- include/configs/ELPT860.h | 17 ++++++++++------- include/configs/EP1C20.h | 40 +++++++++++++++++++++------------------- include/configs/EP1S10.h | 39 ++++++++++++++++++++------------------- include/configs/EP1S40.h | 39 ++++++++++++++++++++------------------- include/configs/EP88x.h | 19 ++++++++++--------- include/configs/ERIC.h | 26 ++++++++++---------------- include/configs/ESTEEM192E.h | 7 +++++-- include/configs/ETX094.h | 12 ++++++++---- include/configs/EVB64260.h | 13 ++++++++----- include/configs/EXBITGEN.h | 12 +++++++----- 12 files changed, 137 insertions(+), 115 deletions(-)
include/configs/EB+MCF-EV123.h +8 -5
@@ -68,17 +68,20 @@#define CFG_ENV_IS_IN_FLASH 1#endif -/*#define CONFIG_COMMANDS ( CONFIG_CMD_DFL & ~(CFG_CMD_LOADS | CFG_CMD_LOADB) ) */ -#define CONFIG_COMMANDS ( CONFIG_CMD_DFL & ~(CFG_CMD_LOADB)) -/* 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_LOADB +#define CONFIG_BOOTDELAY 5#define CFG_PROMPT "\nEV123 U-Boot> "#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/ELPPC.h +10 -5
@@ -68,10 +68,15 @@#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE) -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | CFG_CMD_PCI | 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_PCI +#define CONFIG_CMD_JFFS2 +/* * Miscellaneous configurable options
@@ -84,7 +89,7 @@*/ #define CONFIG_CONS_INDEX 1 -#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 */
@@ -317,7 +322,7 @@* Cache Configuration */ #define CFG_CACHELINE_SIZE 32/* For all MPC74xx CPUs */ -#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/ELPT860.h +10 -7
@@ -91,12 +91,15 @@#define CONFIG_LOADS_ECHO 1/* echo on for serial download */ #undef CFG_LOADS_BAUD_CHANGE/* don't allow baudrate change */ -#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ - CFG_CMD_ASKENV | \ - CFG_CMD_DATE ) -/* 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 +/* * Miscellaneous configurable options
@@ -104,7 +107,7 @@#define CFG_LONGHELP /* undef to save memory */ #define CFG_PROMPT "LEOX_elpt860: "/* 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 */
@@ -224,7 +227,7 @@*/ #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/EP1C20.h +21 -19
@@ -160,25 +160,27 @@#define CONFIG_IPADDR 192.168.2.21#define CONFIG_SERVERIP 192.168.2.16 -/*------------------------------------------------------------------------ -* COMMANDS -*----------------------------------------------------------------------*/ -#define CONFIG_COMMANDS (CFG_CMD_BDI | \ - CFG_CMD_DHCP | \ - CFG_CMD_ECHO | \ - CFG_CMD_ENV | \ - CFG_CMD_FLASH | \ - CFG_CMD_IMI | \ - CFG_CMD_IRQ | \ - CFG_CMD_LOADS | \ - CFG_CMD_LOADB | \ - CFG_CMD_MEMORY | \ - CFG_CMD_MISC | \ - CFG_CMD_NET | \ - CFG_CMD_PING | \ - CFG_CMD_RUN | \ - CFG_CMD_SAVES ) -#include <cmd_confdefs.h> + +/* +* Command line configuration. +*/ +#include <config_cmd_default.h> + +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_IRQ +#define CONFIG_CMD_PING +#define CONFIG_CMD_SAVES + +#undef CONFIG_CMD_AUTOSCRIPT +#undef CONFIG_CMD_BOOTD +#undef CONFIG_CMD_CONSOLE +#undef CONFIG_CMD_FPGA +#undef CONFIG_CMD_IMLS +#undef CONFIG_CMD_ITEST +#undef CONFIG_CMD_NFS +#undef CONFIG_CMD_SETGETDCR +#undef CONFIG_CMD_XIMG +/*------------------------------------------------------------------------ * MISC
include/configs/EP1S10.h +20 -19
@@ -154,25 +154,26 @@#define CONFIG_IPADDR 192.168.2.21#define CONFIG_SERVERIP 192.168.2.16 -/*------------------------------------------------------------------------ -* COMMANDS -*----------------------------------------------------------------------*/ -#define CONFIG_COMMANDS (CFG_CMD_BDI | \ - CFG_CMD_DHCP | \ - CFG_CMD_ECHO | \ - CFG_CMD_ENV | \ - CFG_CMD_FLASH | \ - CFG_CMD_IMI | \ - CFG_CMD_IRQ | \ - CFG_CMD_LOADS | \ - CFG_CMD_LOADB | \ - CFG_CMD_MEMORY | \ - CFG_CMD_MISC | \ - CFG_CMD_NET | \ - CFG_CMD_PING | \ - CFG_CMD_RUN | \ - CFG_CMD_SAVES ) -#include <cmd_confdefs.h> + +/* +* Command line configuration. +*/ +#define CONFIG_CMD_BDI +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_ECHO +#define CONFIG_CMD_ENV +#define CONFIG_CMD_FLASH +#define CONFIG_CMD_IMI +#define CONFIG_CMD_IRQ +#define CONFIG_CMD_LOADS +#define CONFIG_CMD_LOADB +#define CONFIG_CMD_MEMORY +#define CONFIG_CMD_MISC +#define CONFIG_CMD_NET +#define CONFIG_CMD_PING +#define CONFIG_CMD_RUN +#define CONFIG_CMD_SAVES +/*------------------------------------------------------------------------ * MISC
include/configs/EP1S40.h +20 -19
@@ -154,25 +154,26 @@#define CONFIG_IPADDR 192.168.2.21#define CONFIG_SERVERIP 192.168.2.16 -/*------------------------------------------------------------------------ -* COMMANDS -*----------------------------------------------------------------------*/ -#define CONFIG_COMMANDS (CFG_CMD_BDI | \ - CFG_CMD_DHCP | \ - CFG_CMD_ECHO | \ - CFG_CMD_ENV | \ - CFG_CMD_FLASH | \ - CFG_CMD_IMI | \ - CFG_CMD_IRQ | \ - CFG_CMD_LOADS | \ - CFG_CMD_LOADB | \ - CFG_CMD_MEMORY | \ - CFG_CMD_MISC | \ - CFG_CMD_NET | \ - CFG_CMD_PING | \ - CFG_CMD_RUN | \ - CFG_CMD_SAVES ) -#include <cmd_confdefs.h> + +/* +* Command line configuration. +*/ +#define CONFIG_CMD_BDI +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_ECHO +#define CONFIG_CMD_ENV +#define CONFIG_CMD_FLASH +#define CONFIG_CMD_IMI +#define CONFIG_CMD_IRQ +#define CONFIG_CMD_LOADS +#define CONFIG_CMD_LOADB +#define CONFIG_CMD_MEMORY +#define CONFIG_CMD_MISC +#define CONFIG_CMD_NET +#define CONFIG_CMD_PING +#define CONFIG_CMD_RUN +#define CONFIG_CMD_SAVES +/*------------------------------------------------------------------------ * MISC
include/configs/EP88x.h +10 -9
@@ -50,15 +50,16 @@#define CFG_8xx_CPUCLK_MIN 40000000#define CFG_8xx_CPUCLK_MAX 133000000 -#define CONFIG_COMMANDS (CONFIG_CMD_DFL \ - | CFG_CMD_DHCP \ - | CFG_CMD_IMMAP \ - | CFG_CMD_MII \ - | CFG_CMD_PING \ - ) - -/* This must be included AFTER the definition of CONFIG_COMMANDS */ -#include <cmd_confdefs.h> +/* +* Command line configuration. +*/ +#include <config_cmd_default.h> + +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_IMMAP +#define CONFIG_CMD_MII +#define CONFIG_CMD_PING +#define CONFIG_BOOTDELAY 5/* Autoboot after 5 seconds */ #define CONFIG_BOOTCOMMAND "bootm fe060000"/* Autoboot command */
include/configs/ERIC.h +10 -16
@@ -96,23 +96,17 @@#define CONFIG_MII 1/* MII PHY management */ #define CONFIG_PHY_ADDR 1/* PHY address */ -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ - CFG_CMD_PCI | \ - CFG_CMD_IRQ | \ - CFG_CMD_ENV | \ - CFG_CMD_FLASH)/* -* #define CONFIG_COMMANDS (CONFIG_CMD_DFL | CFG_CMD_PCI | CFG_CMD_IRQ | \ -* CFG_CMD_KGDB | CFG_CMD_I2C | CFG_CMD_EEPROM | \ -* CFG_CMD_ENV | CFG_CMD_FLASH) +* Command line configuration. */ +#include <config_cmd_default.h> + +#define CONFIG_CMD_PCI +#define CONFIG_CMD_IRQ +#define CONFIG_CMD_ENV +#define CONFIG_CMD_FLASH -/* CFG_CMD_ENV est definie */ -/* ((CONFIG_CMD_DFL | CFG_CMD_PCI | CFG_CMD_IRQ | CFG_CMD_KGDB) & ~(CFG_CMD_ENV)) -*/ -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -#include <cmd_confdefs.h> #undef CONFIG_WATCHDOG/* watchdog disabled */
@@ -121,7 +115,7 @@*/ #undef 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 */
@@ -325,7 +319,7 @@*/ #define CFG_DCACHE_SIZE 8192/* For AMCC 405 CPUs */ #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 */ #endif
@@ -365,7 +359,7 @@#define BOOTFLAG_COLD 0x01/* Normal Power-On: Boot from FLASH */ #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_SER_INDEX 2/* which serial port to use */ #endif
include/configs/ESTEEM192E.h +5 -2
@@ -72,8 +72,11 @@#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE) -/* 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 CFG_LONGHELP /* undef to save memory */ #define CFG_PROMPT "BOOT: "/* Monitor Command Prompt */
include/configs/ETX094.h +8 -4
@@ -84,15 +84,19 @@#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE) -/* 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 */ #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 */
@@ -179,7 +183,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/EVB64260.h +8 -5
@@ -107,17 +107,20 @@ CONFIG_BOOTP_BOOTFILESIZE) -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | CFG_CMD_ASKENV) +/* +* Command line configuration. +*/ +#include <config_cmd_default.h> + +#define CONFIG_CMD_ASKENV -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -#include <cmd_confdefs.h> /* * Miscellaneous configurable options */ #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 */
@@ -391,7 +394,7 @@* Cache Configuration */ #define CFG_CACHELINE_SIZE 32/* For all MPC74xx CPUs */ -#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/EXBITGEN.h +7 -5
@@ -82,10 +82,12 @@#define CONFIG_MII 1/* MII PHY management */ #define CONFIG_PHY_ADDR 0/* PHY address */ -#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> +#undef CONFIG_WATCHDOG/* watchdog disabled */
@@ -94,7 +96,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 */
@@ -206,7 +208,7 @@#define BOOTFLAG_COLD 0x01/* Normal Power-On: Boot from FLASH */ #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_SER_INDEX 2/* which serial port to use */ #endif
Signature · 1 line
1.5.2.2.249.g45fd