include/configs: Use new CONFIG_CMD_* in various a* named board config files.
PATCH 8/25 include/configs: Use new CONFIG_CMD_* in various a* named board config files.
Signed-off-by Jon Loeliger <[email protected]>
--- include/configs/acadia.h | 62 +++++++++++++++++++++++---------------- include/configs/adsvix.h | 17 ++++++++-- include/configs/aev.h | 49 +++++++++++++++---------------- include/configs/alpr.h | 45 +++++++++++++++------------- include/configs/armadillo.h | 8 +++-- include/configs/assabet.h | 15 ++++++--- include/configs/at91rm9200dk.h | 28 ++++++++++-------- include/configs/atc.h | 24 ++++++++------- include/configs/atstk1002.h | 57 ++++++++++++------------------------ 9 files changed, 160 insertions(+), 145 deletions(-)
include/configs/acadia.h +36 -26
@@ -123,10 +123,8 @@#define CFG_FLASH_USE_BUFFER_WRITE 1/* use buffered writes (20x faster) */ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ -#define _CFG_CMD_INCLUDE (CFG_CMD_ALL)#else #define CFG_NO_FLASH 1/* No NOR on Acadia when NAND-booting */ -#define _CFG_CMD_INCLUDE ((CFG_CMD_ALL) & ~(CFG_CMD_FLASH | CFG_CMD_IMLS))#endif #ifdef CFG_ENV_IS_IN_FLASH
@@ -301,27 +299,39 @@#define CONFIG_SUPPORT_VFAT -#define CONFIG_COMMANDS ((CONFIG_CMD_DFL & _CFG_CMD_INCLUDE) | \ - CFG_CMD_ASKENV | \ - CFG_CMD_DHCP | \ - CFG_CMD_DTT | \ - CFG_CMD_DIAG | \ - CFG_CMD_EEPROM | \ - CFG_CMD_ELF | \ - CFG_CMD_FAT | \ - CFG_CMD_I2C | \ - CFG_CMD_IRQ | \ - CFG_CMD_MII | \ - CFG_CMD_NAND | \ - CFG_CMD_NET | \ - CFG_CMD_NFS | \ - CFG_CMD_PCI | \ - CFG_CMD_PING | \ - CFG_CMD_REGINFO | \ - CFG_CMD_USB) - -/* 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_DTT +#define CONFIG_CMD_DIAG +#define CONFIG_CMD_EEPROM +#define CONFIG_CMD_ELF +#define CONFIG_CMD_FAT +#define CONFIG_CMD_I2C +#define CONFIG_CMD_IRQ +#define CONFIG_CMD_MII +#define CONFIG_CMD_NAND +#define CONFIG_CMD_NET +#define CONFIG_CMD_NFS +#define CONFIG_CMD_PCI +#define CONFIG_CMD_PING +#define CONFIG_CMD_REGINFO +#define CONFIG_CMD_USB + +/* +* No NOR on Acadia when NAND-booting +*/ +#if defined(CONFIG_NAND_U_BOOT ) || defined(CONFIG_NAND_SPL ) +#undef CONFIG_CMD_FLASH +#undef CONFIG_CMD_IMLS +#endif + +#undef CONFIG_WATCHDOG/* watchdog disabled */
@@ -330,7 +340,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 */
@@ -373,7 +383,7 @@*/ #define CFG_DCACHE_SIZE 16384/* For AMCC 405EZ CPU */ #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
@@ -489,7 +499,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/adsvix.h +13 -4
@@ -68,10 +68,19 @@#define CONFIG_DOS_PARTITION 1 -#define CONFIG_COMMANDS ((CONFIG_CMD_DFL & ~CFG_CMD_NET) | CFG_CMD_MMC | CFG_CMD_FAT | CFG_CMD_IDE | CFG_CMD_PCMCIA) -/* 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_FAT +#define CONFIG_CMD_IDE +#define CONFIG_CMD_MMC +#define CONFIG_CMD_PCMCIA + +#undef CONFIG_CMD_NET +#undef CONFIG_SHOW_BOOT_PROGRESS
@@ -162,7 +171,7 @@#define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */ /* #define CONFIG_INITRD_TAG 1 */ -#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/aev.h +24 -25
75 lines not on this page · raw message
include/configs/alpr.h +24 -21
63 lines not on this page · raw message
include/configs/armadillo.h +5 -3
@@ -73,10 +73,12 @@#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_BOOTDELAY 3#define CONFIG_BOOTARGS "root=/dev/ram0 rootfstype=ext2 console=ttyAM0,115200"
include/configs/assabet.h +10 -5
@@ -66,18 +66,23 @@#define CONFIG_BAUDRATE 115200 -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | CFG_CMD_DHCP) -#define CONFIG_BOOTP_MASK CONFIG_BOOTP_DEFAULT -/* 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_BOOTP_MASK CONFIG_BOOTP_DEFAULT#define CONFIG_BOOTDELAY 3#define CONFIG_BOOTARGS "console=ttySA0,115200n8 root=/dev/nfs ip=bootp"#define CONFIG_BOOTCOMMAND "bootp;tftp;bootm"#define CFG_AUTOLOAD "n"/* No autoload */ -#if (CONFIG_COMMANDS &CFG_CMD_KGDB ) +#if defined(CONFIG_CMD_KGDB )#define CONFIG_KGDB_BAUDRATE 115200/* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2/* which serial port to use */ #endif
include/configs/at91rm9200dk.h +16 -12
@@ -97,18 +97,22 @@#define CONFIG_BOOTDELAY 3/* #define CONFIG_ENV_OVERWRITE 1 */ -#define CONFIG_COMMANDS \ - ((CONFIG_CMD_DFL | CFG_CMD_MII |\ - CFG_CMD_DHCP ) & \ - ~(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_MII +#define CONFIG_CMD_DHCP + +#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
include/configs/atc.h +13 -11
@@ -126,25 +126,27 @@#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT|CONFIG_BOOTP_BOOTFILESIZE) -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ - CFG_CMD_EEPROM | \ - CFG_CMD_PCI | \ - CFG_CMD_PCMCIA | \ - CFG_CMD_DATE | \ - CFG_CMD_IDE) +/* +* Command line configuration. +*/ +#include <config_cmd_default.h> -#define CONFIG_DOS_PARTITION +#define CONFIG_CMD_EEPROM +#define CONFIG_CMD_PCI +#define CONFIG_CMD_PCMCIA +#define CONFIG_CMD_DATE +#define CONFIG_CMD_IDE -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -#include <cmd_confdefs.h> + +#define CONFIG_DOS_PARTITION /* * 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 */
@@ -285,7 +287,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/atstk1002.h +19 -38
63 lines not on this page · raw message
Signature · 1 line
1.5.2.2.249.g45fd