include/configs: Use new CONFIG_CMD_* in various [TUVWZYZ]* named board config files.
PATCH 15/18 include/configs: Use new CONFIG_CMD_* in various [TUVWZYZ]* named board config files.
Signed-off-by Jon Loeliger <[email protected]>
--- include/configs/TASREG.h | 23 +++++++++++------- include/configs/TOP860.h | 38 +++++++++++++++---------------- include/configs/VCMA9.h | 45 +++++++++++++++++-------------------- include/configs/VOH405.h | 39 +++++++++++++++++--------------- include/configs/VOM405.h | 33 +++++++++++++++------------ include/configs/VoVPN-GW.h | 41 +++++++++++++++++---------------- include/configs/W7OLMC.h | 29 ++++++++++++++++-------- include/configs/W7OLMG.h | 31 +++++++++++++++++-------- include/configs/WUH405.h | 33 +++++++++++++++------------ include/configs/XPEDITE1K.h | 43 +++++++++++++++++------------------ include/configs/Yukon8220.h | 51 +++++++++++++++++++++---------------------- include/configs/ZPC1900.h | 26 +++++++++++---------- include/configs/ZUMA.h | 25 +++++++++++--------- 13 files changed, 245 insertions(+), 212 deletions(-)
include/configs/TASREG.h +14 -9
@@ -50,20 +50,25 @@#undef CONFIG_MONITOR_IS_IN_RAM/* no pre-loader required!!! ;-) */ -#define CONFIG_COMMANDS ((CONFIG_CMD_DFL | \ - CFG_CMD_BSP | \ - CFG_CMD_EEPROM | \ - CFG_CMD_I2C ) & \ - ~(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_BSP +#define CONFIG_CMD_EEPROM +#define CONFIG_CMD_I2C + +#undef CONFIG_CMD_NET + +#define CONFIG_BOOTDELAY 3#define CFG_PROMPT "=> "#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/TOP860.h +18 -20
@@ -107,30 +107,28 @@*/ #define CFG_MATCH_PARTIAL_CMD +/* -* List of available monitor commands. Use the system default list -* plus add some of the "non-standard" commands back in. -* See ./cmd_confdefs.h -*/ -#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ - CFG_CMD_ASKENV | \ - CFG_CMD_DHCP | \ - CFG_CMD_I2C | \ - CFG_CMD_EEPROM | \ - CFG_CMD_REGINFO | \ - CFG_CMD_IMMAP | \ - CFG_CMD_ELF | \ - CFG_CMD_DATE | \ - CFG_CMD_MII | \ - CFG_CMD_BEDBUG \ - ) +* Command line configuration. +*/ +#include <config_cmd_default.h> + +#define CONFIG_CMD_ASKENV +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_I2C +#define CONFIG_CMD_EEPROM +#define CONFIG_CMD_REGINFO +#define CONFIG_CMD_IMMAP +#define CONFIG_CMD_ELF +#define CONFIG_CMD_DATE +#define CONFIG_CMD_MII +#define CONFIG_CMD_BEDBUG +#define CONFIG_AUTOSCRIPT 1#define CFG_LOADS_BAUD_CHANGE 1#undef CONFIG_LOADS_ECHO/* NO echo on for serial download */ -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -#include <cmd_confdefs.h> #define CFG_LONGHELP /* undef to save memory */ #define CFG_PROMPT "=> "/* Monitor Command Prompt */
@@ -141,7 +139,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 */
@@ -239,7 +237,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/VCMA9.h +21 -24
68 lines not on this page · raw message
include/configs/VOH405.h +21 -18
@@ -58,28 +58,31 @@#define CONFIG_PHY_CLK_FREQ EMAC_STACR_CLK_66MHZ/* 66 MHz OPB clock*/ -#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ - CFG_CMD_DHCP | \ - CFG_CMD_PCI | \ - CFG_CMD_IRQ | \ - CFG_CMD_IDE | \ - CFG_CMD_FAT | \ - CFG_CMD_ELF | \ - CFG_CMD_NAND | \ - CFG_CMD_DATE | \ - CFG_CMD_I2C | \ - CFG_CMD_MII | \ - CFG_CMD_PING | \ - 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_ELF +#define CONFIG_CMD_NAND +#define CONFIG_CMD_DATE +#define CONFIG_CMD_I2C +#define CONFIG_CMD_MII +#define CONFIG_CMD_PING +#define CONFIG_CMD_EEPROM +#define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION #define CONFIG_SUPPORT_VFAT -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -#include <cmd_confdefs.h> -#undef CONFIG_WATCHDOG/* watchdog disabled */ #define CONFIG_RTC_MC146818 /* DS1685 is MC146818 compatible*/
@@ -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 */
@@ -319,7 +322,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/VOM405.h +18 -15
@@ -65,19 +65,22 @@ CONFIG_BOOTP_DNS2 | \ CONFIG_BOOTP_SEND_HOSTNAME ) -#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ - CFG_CMD_DHCP | \ - CFG_CMD_BSP | \ - CFG_CMD_PCI | \ - CFG_CMD_IRQ | \ - CFG_CMD_ELF | \ - 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_BSP +#define CONFIG_CMD_PCI +#define CONFIG_CMD_IRQ +#define CONFIG_CMD_ELF +#define CONFIG_CMD_I2C +#define CONFIG_CMD_MII +#define CONFIG_CMD_PING +#define CONFIG_CMD_EEPROM +#undef CONFIG_WATCHDOG/* watchdog disabled */
@@ -96,7 +99,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 */
@@ -244,7 +247,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/VoVPN-GW.h +21 -20
59 lines not on this page · raw message
include/configs/W7OLMC.h +19 -10
@@ -70,13 +70,22 @@#define CONFIG_RTC_M48T35A 1/* ST Electronics M48 timekeeper */ -#define CONFIG_COMMANDS \ - (CONFIG_CMD_DFL | CFG_CMD_PCI | CFG_CMD_IRQ | CFG_CMD_ASKENV | \ - CFG_CMD_DHCP | CFG_CMD_BEDBUG | CFG_CMD_DATE | CFG_CMD_I2C | \ - CFG_CMD_EEPROM | CFG_CMD_ELF | CFG_CMD_BSP | CFG_CMD_REGINFO) - -/* 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_IRQ +#define CONFIG_CMD_ASKENV +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_BEDBUG +#define CONFIG_CMD_DATE +#define CONFIG_CMD_I2C +#define CONFIG_CMD_EEPROM +#define CONFIG_CMD_ELF +#define CONFIG_CMD_BSP +#define CONFIG_CMD_REGINFO #undef CONFIG_WATCHDOG/* watchdog disabled */ #define CONFIG_HW_WATCHDOG /* HW Watchdog, board specific */
@@ -92,7 +101,7 @@#ifdef CFG_HUSH_PARSER #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 */
@@ -277,7 +286,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 val. */ #endif
@@ -309,7 +318,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/W7OLMG.h +21 -10
@@ -75,14 +75,25 @@#define CFG_DTT_LOW_TEMP -30#define CFG_DTT_HYSTERESIS 3 -#define CONFIG_COMMANDS \ - (CONFIG_CMD_DFL | CFG_CMD_PCI | CFG_CMD_IRQ | CFG_CMD_ASKENV | \ - CFG_CMD_DHCP | CFG_CMD_BEDBUG | CFG_CMD_DATE | CFG_CMD_I2C | \ - CFG_CMD_EEPROM | CFG_CMD_ELF | CFG_CMD_BSP | CFG_CMD_REGINFO | \ - CFG_CMD_DTT) -/* 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_IRQ +#define CONFIG_CMD_ASKENV +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_BEDBUG +#define CONFIG_CMD_DATE +#define CONFIG_CMD_I2C +#define CONFIG_CMD_EEPROM +#define CONFIG_CMD_ELF +#define CONFIG_CMD_BSP +#define CONFIG_CMD_REGINFO +#define CONFIG_CMD_DTT +#undef CONFIG_WATCHDOG/* watchdog disabled */ #define CONFIG_HW_WATCHDOG /* HW Watchdog, board specific */
@@ -98,7 +109,7 @@#ifdef CFG_HUSH_PARSER #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 */
@@ -278,7 +289,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 val. */ #endif
@@ -310,7 +321,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/WUH405.h +18 -15
@@ -60,19 +60,22 @@#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_DATE | \ - 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_DATE +#define CONFIG_CMD_I2C +#define CONFIG_CMD_MII +#define CONFIG_CMD_PING +#define CONFIG_CMD_EEPROM +#undef CONFIG_WATCHDOG/* watchdog disabled */
@@ -92,7 +95,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 */
@@ -270,7 +273,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/XPEDITE1K.h +21 -22
67 lines not on this page · raw message
include/configs/Yukon8220.h +25 -26
81 lines not on this page · raw message
include/configs/ZPC1900.h +14 -12
@@ -106,22 +106,24 @@#define CONFIG_BAUDRATE 38400 -#define CONFIG_COMMANDS (CONFIG_CMD_DFL \ - | CFG_CMD_ASKENV \ - | CFG_CMD_DHCP \ - | 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_ASKENV +#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 "dhcp;bootm"/* autoboot command */ #define CONFIG_BOOTARGS "root=/dev/nfs rw ip=:::::eth0:dhcp" -#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 */
@@ -139,7 +141,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 */
@@ -223,7 +225,7 @@#endif #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/ZUMA.h +14 -11
@@ -106,12 +106,18 @@#define CONFIG_MII /* enable MII commands */ -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ - CFG_CMD_ASKENV | \ - CFG_CMD_BSP | \ - CFG_CMD_JFFS2 | \ - CFG_CMD_MII | \ - CFG_CMD_DATE) + +/* +* Command line configuration. +*/ +#include <config_cmd_default.h> + +#define CONFIG_CMD_ASKENV +#define CONFIG_CMD_BSP +#define CONFIG_CMD_JFFS2 +#define CONFIG_CMD_MII +#define CONFIG_CMD_DATE +/* * JFFS2 partitions
@@ -131,15 +137,12 @@#define MTDPARTS_DEFAULT "mtdparts=zuma-1:-(jffs2),zuma-2:-(user)" */ -/* 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 */
@@ -349,7 +352,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
Signature · 1 line
1.5.2.2.249.g45fd