include/configs: Use new CONFIG_CMD_* in various o* named board config files.
PATCH 20/25 include/configs: Use new CONFIG_CMD_* in various o* named board config files.
Signed-off-by Jon Loeliger <[email protected]>
--- include/configs/o2dnt.h | 36 +++++++++++++++--------------- include/configs/ocotea.h | 49 +++++++++++++++++++++------------------- include/configs/omap1510inn.h | 16 ++++++++++--- include/configs/omap1610h2.h | 14 ++++++++--- include/configs/omap1610inn.h | 14 ++++++++--- include/configs/omap2420h4.h | 22 ++++++++++++++---- include/configs/omap5912osk.h | 14 ++++++++--- include/configs/omap730p2.h | 13 ++++++---- 8 files changed, 111 insertions(+), 67 deletions(-)
include/configs/o2dnt.h +18 -18
@@ -37,11 +37,6 @@#define BOOTFLAG_COLD 0x01/* Normal Power-On: Boot from FLASH */ #define BOOTFLAG_WARM 0x02/* Software reboot */ -#define CFG_CACHELINE_SIZE 32/* For MPC5xxx CPUs */ -#if (CONFIG_COMMANDS &CFG_CMD_KGDB ) -# define CFG_CACHELINE_SHIFT 5/* log base 2 of the above value */ -#endif -/* * Serial console configuration */
@@ -82,20 +77,20 @@#define CONFIG_TIMESTAMP /* Print image info with timestamp */ +/* -* Supported commands +* Command line configuration. */ -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ - CFG_CMD_EEPROM | \ - CFG_CMD_FAT | \ - CFG_CMD_I2C | \ - CFG_CMD_NFS | \ - CFG_CMD_MII | \ - CFG_CMD_PING | \ - ADD_PCI_CMD ) - -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -#include <cmd_confdefs.h> +#include <config_cmd_default.h> + +#define CONFIG_CMD_EEPROM +#define CONFIG_CMD_FAT +#define CONFIG_CMD_I2C +#define CONFIG_CMD_NFS +#define CONFIG_CMD_MII +#define CONFIG_CMD_PING +#define CONFIG_PCI_CMD +#if (TEXT_BASE ==0xFF000000 )/* Boot low with 16 MB Flash */ # define CFG_LOWBOOT 1
@@ -246,7 +241,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 */
@@ -262,6 +257,11 @@#define CFG_HZ 1000/* decrementer freq: 1 ms ticks */ +#define CFG_CACHELINE_SIZE 32/* For MPC5xxx CPUs */ +#if defined(CONFIG_CMD_KGDB ) +# define CFG_CACHELINE_SHIFT 5/* log base 2 of the above value */ +#endif +/* * Various low-level settings */
include/configs/ocotea.h +26 -23
73 lines not on this page · raw message
include/configs/omap1510inn.h +12 -4
@@ -86,11 +86,19 @@#define CONFIG_BAUDRATE 115200#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | CFG_CMD_DHCP) +#define CONFIG_COMMANDS (CONFIG_CMD_DFL + + +/* +* Command line configuration. +*/ +#include <config_cmd_default.h> + +#define CONFIG_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> #include <configs/omap1510.h> #define CONFIG_BOOTDELAY 3
@@ -98,7 +106,7 @@#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 */ /* what's this ? it's not used anywhere */ #define CONFIG_KGDB_SER_INDEX 1/* which serial port to use */
include/configs/omap1610h2.h +10 -4
@@ -81,11 +81,17 @@#define CONFIG_BAUDRATE 115200#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | CFG_CMD_DHCP) + +/* +* Command line configuration. +*/ +#include <config_cmd_default.h> + +#define CONFIG_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> #include <configs/omap1510.h> #define CONFIG_BOOTDELAY 3
@@ -93,7 +99,7 @@#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 1/* which serial port to use */ #endif
include/configs/omap1610inn.h +10 -4
@@ -82,11 +82,17 @@#define CONFIG_BAUDRATE 115200#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | CFG_CMD_DHCP) + +/* +* Command line configuration. +*/ +#include <config_cmd_default.h> + +#define CONFIG_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> #include <configs/omap1510.h> #define CONFIG_BOOTDELAY 3
@@ -98,7 +104,7 @@#define CONFIG_SERVERIP 156.117.97.139/* current IP of my dev pc */ #define CONFIG_BOOTFILE "uImage"/* file to load */ -#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 1/* which serial port to use */ #endif
include/configs/omap2420h4.h +17 -5
@@ -119,15 +119,27 @@#define CONFIG_BAUDRATE 115200#define CFG_BAUDRATE_TABLE {9600, 19200, 38400, 57600, 115200} + +/* +* Command line configuration. +*/ +#include <config_cmd_default.h> +#ifdef CFG_NAND_BOOT -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | CFG_CMD_DHCP | CFG_CMD_I2C | CFG_CMD_NAND | CFG_CMD_JFFS2) +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_I2C +#define CONFIG_CMD_NAND +#define CONFIG_CMD_JFFS2 #else -#define CONFIG_COMMANDS ((CONFIG_CMD_DFL | CFG_CMD_DHCP | CFG_CMD_I2C | CFG_CMD_JFFS2) & ~CFG_CMD_AUTOSCRIPT) +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_I2C +#define CONFIG_CMD_JFFS2 + +#undef CONFIG_CMD_AUTOSCRIPT#endif -#define CONFIG_BOOTP_MASK CONFIG_BOOTP_DEFAULT -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -#include <cmd_confdefs.h> + +#define CONFIG_BOOTP_MASK CONFIG_BOOTP_DEFAULT/* * Board NAND Info.
include/configs/omap5912osk.h +10 -4
@@ -86,11 +86,17 @@#define CONFIG_BAUDRATE 115200#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | CFG_CMD_DHCP) + +/* +* Command line configuration. +*/ +#include <config_cmd_default.h> + +#define CONFIG_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> #include <configs/omap1510.h> #define CONFIG_BOOTDELAY 3
@@ -102,7 +108,7 @@#define CONFIG_SERVERIP 156.117.97.139/* current IP of my dev pc */ #define CONFIG_BOOTFILE "uImage"/* file to load */ -#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 1/* which serial port to use */ #endif
include/configs/omap730p2.h +8 -5
@@ -90,14 +90,17 @@#define CONFIG_BAUDRATE 115200#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 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) +* Command line configuration. */ +#include <config_cmd_default.h> + +#define CONFIG_CMD_DHCP + + +#define CONFIG_BOOTP_MASK CONFIG_BOOTP_DEFAULT -#include <cmd_confdefs.h> #include <configs/omap730.h> #include <configs/h2_p2_dbg_board.h>
@@ -112,7 +115,7 @@#define CONFIG_SERVERIP 192.150.0.100#define CONFIG_BOOTFILE "uImage"/* File to load */ -#if defined (CONFIG_COMMANDS ) && defined (CFG_CMD_KGDB ) +#if defined(CONFIG_CMD_KGDB )#define CONFIG_KGDB_BAUDRATE 115200/* Speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 1/* Which serial port to use */ #endif
Signature · 1 line
1.5.2.2.249.g45fd