include/configs: Use new CONFIG_CMD_* in various e* named board config files.
PATCH 12/25 include/configs: Use new CONFIG_CMD_* in various e* named board config files.
Signed-off-by Jon Loeliger <[email protected]>
--- include/configs/eXalion.h | 23 ++++++++------- include/configs/ebony.h | 49 +++++++++++++++++--------------- include/configs/ep7312.h | 12 +++++-- include/configs/ep8248.h | 34 ++++++++++++---------- include/configs/ep8260.h | 69 ++++++++++++++++++++++----------------------- include/configs/ep82xxm.h | 45 +++++++++++++++------------- include/configs/evb4510.h | 13 ++++++-- 7 files changed, 131 insertions(+), 114 deletions(-)
include/configs/eXalion.h +12 -11
@@ -58,17 +58,18 @@/*#define CONFIG_DRAM_SPEED 66 */ /* MHz */ -#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ - CFG_CMD_FLASH | \ - CFG_CMD_SDRAM | \ - CFG_CMD_I2C | \ - CFG_CMD_IDE | \ - CFG_CMD_FAT | \ - CFG_CMD_ENV | \ - CFG_CMD_PCI ) +/* +* Command line configuration. +*/ +#include <config_cmd_default.h> -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -#include <cmd_confdefs.h> +#define CONFIG_CMD_FLASH +#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 */ #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
include/configs/ebony.h +26 -23
73 lines not on this page · raw message
include/configs/ep7312.h +8 -4
@@ -64,10 +64,14 @@#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_BOOTARGS "devfs=mount root=ramfs console=ttyS0,9600"
@@ -78,7 +82,7 @@/*#define CONFIG_BOOTFILE "impa7" */ #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_SER_INDEX 2/* which serial port to use */ #endif
include/configs/ep8248.h +18 -16
@@ -123,23 +123,25 @@#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_BOOTCOMMAND "bootm FF860000"/* autoboot command */ #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 */ #define CONFIG_KGDB_ON_SCC /* define if kgdb on SCC */ #undef CONFIG_KGDB_NONE/* define if kgdb on something else */
@@ -157,7 +159,7 @@#define CFG_PROMPT_HUSH_PS2 "> "#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 */
@@ -183,7 +185,7 @@#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_NUM_BANKS CFG_MAX_FLASH_BANKS#define CFG_JFFS2_FIRST_SECTOR 0
@@ -192,7 +194,7 @@#define CFG_JFFS_CUSTOM_PART #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 CFG_I2C_SPEED 100000/* I2C speed */ #define CFG_I2C_SLAVE 0x7F/* I2C slave address */
@@ -240,7 +242,7 @@#define CFG_BOOTMAPSZ (8 << 20)/* Initial Memory map for Linux */ #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 */ #endif
include/configs/ep8260.h +34 -35
91 lines not on this page · raw message
include/configs/ep82xxm.h +24 -21
81 lines not on this page · raw message
include/configs/evb4510.h +9 -4
@@ -74,10 +74,15 @@#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_NETMASK 255.255.255.0
@@ -89,7 +94,7 @@#define CONFIG_BOOTCOMMAND "tftp 100000 uImage"/* #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_SER_INDEX 2/* which serial port to use */ #endif
Signature · 1 line
1.5.2.2.249.g45fd