include/configs: Use new CONFIG_CMD_* in sbc* board config files.
PATCH 4/25 include/configs: Use new CONFIG_CMD_* in sbc* board config files.
Signed-off-by Jon Loeliger <[email protected]>
--- include/configs/sbc2410x.h | 38 ++++++++++++++------------------ include/configs/sbc405.h | 32 ++++++++++++++------------- include/configs/sbc8240.h | 29 +++++++++++++------------ include/configs/sbc8260.h | 47 +++++++++++++++++++--------------------- include/configs/sbc8349.h | 51 +++++++++++++++---------------------------- 5 files changed, 89 insertions(+), 108 deletions(-)
include/configs/sbc2410x.h +17 -21
@@ -82,24 +82,20 @@#define CONFIG_BAUDRATE 115200 -/*********************************************************** -* Command definition -***********************************************************/ -#define CONFIG_COMMANDS \ - (CONFIG_CMD_DFL | \ - CFG_CMD_CACHE | \ - /*CFG_CMD_NAND |*/ \ -/*CFG_CMD_EEPROM |*/ \ -/*CFG_CMD_I2C |*/ \ -/*CFG_CMD_USB |*/ \ -CFG_CMD_REGINFO | \ - CFG_CMD_DATE | \ - CFG_CMD_PING | \ - CFG_CMD_DHCP | \ - CFG_CMD_ELF) - -/* 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_CACHE +#define CONFIG_CMD_DATE +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_ELF +#define CONFIG_CMD_PING +#define CONFIG_CMD_REGINFO +#define CONFIG_BOOTDELAY 3#define CONFIG_BOOTARGS "console=ttySAC0 root=/dev/nfs nfsroot=192.168.0.1:/friendly-arm/rootfs_netserv ip=192.168.0.69:192.168.0.1:192.168.0.1:255.255.255.0:debian:eth0:off"
@@ -110,7 +106,7 @@/*#define CONFIG_BOOTFILE "elinos-lart" */ #define CONFIG_BOOTCOMMAND "dhcp; bootm" -#if (CONFIG_COMMANDS &CFG_CMD_KGDB ) +#if defined(CONFIG_CMD_KGDB )#define CONFIG_KGDB_BAUDRATE 115200/* speed to run kgdb serial port */ /* what's this ? it's not used anywhere */ #define CONFIG_KGDB_SER_INDEX 1/* which serial port to use */
@@ -193,7 +189,7 @@/*----------------------------------------------------------------------- * NAND flash settings */ -#if (CONFIG_COMMANDS &CFG_CMD_NAND ) +#if defined(CONFIG_CMD_NAND )#define CFG_MAX_NAND_DEVICE 1/* Max number of NAND devices */ #define SECTORSIZE 512
@@ -219,7 +215,7 @@#define NAND_CTL_CLRCLE (nandptr)#define NAND_CTL_SETCLE (nandptr)/* #undef CONFIG_MTD_NAND_VERIFY_WRITE */ -#endif /* CONFIG_COMMANDS & CFG_CMD_NAND */ +#endif /* CONFIG_CMD_NAND */ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG
include/configs/sbc405.h +17 -15
@@ -88,19 +88,21 @@#define CONFIG_ENV_OVERWRITE -#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ - CFG_CMD_BSP | \ - CFG_CMD_ELF | \ - CFG_CMD_I2C | \ - CFG_CMD_IRQ | \ - CFG_CMD_MII | \ - CFG_CMD_PCI | \ - CFG_CMD_PING | \ - CFG_CMD_SDRAM | \ - 0 ) - -/* 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_ELF +#define CONFIG_CMD_I2C +#define CONFIG_CMD_IRQ +#define CONFIG_CMD_MII +#define CONFIG_CMD_PCI +#define CONFIG_CMD_PING +#define CONFIG_CMD_SDRAM +#undef CONFIG_WATCHDOG/* watchdog disabled */
@@ -123,7 +125,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 */
@@ -229,7 +231,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/sbc8240.h +15 -14
@@ -79,20 +79,21 @@#define CONFIG_ENV_OVERWRITE -#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \ - CFG_CMD_BSP | \ - CFG_CMD_DIAG | \ - CFG_CMD_ELF | \ - CFG_CMD_ENV | \ - CFG_CMD_FLASH | \ - CFG_CMD_PCI | \ - CFG_CMD_PING | \ - CFG_CMD_SDRAM | \ - 0 ) - -/* This must be included AFTER the definition of CONFIG_COMMANDS (if any) + +/* +* Command line configuration. */ -#include <cmd_confdefs.h> +#include <config_cmd_default.h> + +#define CONFIG_CMD_BSP +#define CONFIG_CMD_DIAG +#define CONFIG_CMD_ELF +#define CONFIG_CMD_ENV +#define CONFIG_CMD_FLASH +#define CONFIG_CMD_PCI +#define CONFIG_CMD_PING +#define CONFIG_CMD_SDRAM +/* * Miscellaneous configurable options
@@ -340,7 +341,7 @@ typedef unsigned int led_id_t;* 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/sbc8260.h +22 -25
69 lines not on this page · raw message
include/configs/sbc8349.h +18 -33
79 lines not on this page · raw message
Signature · 1 line
1.5.2.2.249.g45fd