include/configs: Use new CONFIG_CMD_* in various H* named board config files.
PATCH 7/18 include/configs: Use new CONFIG_CMD_* in various H* named board config files.
Signed-off-by Jon Loeliger <[email protected]>
--- include/configs/HH405.h | 42 ++++++++++++++++++++------------------ include/configs/HIDDEN_DRAGON.h | 22 +++++++++++--------- include/configs/HMI10.h | 42 ++++++++++++++++---------------------- include/configs/HUB405.h | 31 +++++++++++++++------------- 4 files changed, 69 insertions(+), 68 deletions(-)
include/configs/HH405.h +22 -20
@@ -103,21 +103,26 @@#define ADD_BMP_CMD 0#endif /* CONFIG_VIDEO */ -#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ - CFG_CMD_DHCP | \ - CFG_CMD_PCI | \ - CFG_CMD_IRQ | \ - CFG_CMD_IDE | \ - CFG_CMD_FAT | \ - CFG_CMD_EXT2 | \ - CFG_CMD_ELF | \ - CFG_CMD_NAND | \ - CFG_CMD_I2C | \ - CFG_CMD_DATE | \ - CFG_CMD_MII | \ - CFG_CMD_PING | \ - ADD_BMP_CMD | \ - CFG_CMD_EEPROM ) +/* +* Command line configuration. +*/ +#include <config_cmd_default.h> + +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_PCI +#define CONFIG_CMD_IRQ +#define CONFIG_CMD_IDE +#define CONFIG_CMD_FAT +#define CONFIG_CMD_EXT2 +#define CONFIG_CMD_ELF +#define CONFIG_CMD_NAND +#define CONFIG_CMD_I2C +#define CONFIG_CMD_DATE +#define CONFIG_CMD_MII +#define CONFIG_CMD_PING +#define CONFIG_BMP_CMD +#define CONFIG_CMD_EEPROM +#define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION
@@ -127,9 +132,6 @@#define CONFIG_AUTO_UPDATE 1/* autoupdate via compactflash */ #undef CONFIG_AUTO_UPDATE_SHOW/* use board show routine */ -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -#include <cmd_confdefs.h> -#define CFG_NAND_LEGACY #undef CONFIG_BZIP2/* include support for bzip2 compressed images */
@@ -148,7 +150,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 */
@@ -377,7 +379,7 @@#define CFG_DCACHE_SIZE 16384/* For AMCC 405 CPUs, older 405 ppc's */ /* have only 8kB, 16kB is save here */ #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/HIDDEN_DRAGON.h +12 -10
@@ -52,16 +52,18 @@#define CONFIG_BAUDRATE 9600#define CONFIG_DRAM_SPEED 100/* MHz */ -#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ - CFG_CMD_EEPROM | \ - CFG_CMD_ELF | \ - CFG_CMD_I2C | \ - CFG_CMD_NET | \ - CFG_CMD_PCI | \ - 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_EEPROM +#define CONFIG_CMD_ELF +#define CONFIG_CMD_I2C +#define CONFIG_CMD_NET +#define CONFIG_CMD_PCI +#define CONFIG_CMD_PING /* * Miscellaneous configurable options
@@ -363,7 +365,7 @@* Cache Configuration */ #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 */ #endif
include/configs/HMI10.h +18 -24
63 lines not on this page · raw message
include/configs/HUB405.h +17 -14
@@ -60,18 +60,21 @@#define CONFIG_PHY_CLK_FREQ EMAC_STACR_CLK_66MHZ/* 66 MHz OPB clock*/ -#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ - CFG_CMD_DHCP | \ - CFG_CMD_IRQ | \ - CFG_CMD_ELF | \ - CFG_CMD_NAND | \ - CFG_CMD_I2C | \ - CFG_CMD_MII | \ - CFG_CMD_PING | \ - CFG_CMD_EEPROM ) - -/* 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_IRQ +#define CONFIG_CMD_ELF +#define CONFIG_CMD_NAND +#define CONFIG_CMD_I2C +#define CONFIG_CMD_MII +#define CONFIG_CMD_PING +#define CONFIG_CMD_EEPROM +#undef CONFIG_WATCHDOG/* watchdog disabled */
@@ -88,7 +91,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 */
@@ -271,7 +274,7 @@#define CFG_DCACHE_SIZE 16384/* For AMCC 405 CPUs, older 405 ppc's */ /* have only 8kB, 16kB is save here */ #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
Signature · 1 line
1.5.2.2.249.g45fd