include/configs: Use new CONFIG_CMD_* in 85xx board config files.
PATCH 2/4 include/configs: Use new CONFIG_CMD_* in 85xx board config files.
Signed-off-by Jon Loeliger <[email protected]>
---
This is all 85xx boards, not just the Freescale 85xx boards.
Tested by building all boards in ./MAKEALL 85xx.
Note that very minor liberties were taken in a few of these conversions. Specifically, I did not care much if I slightly altered the set of commands that were present under the nefarious CFG_RAMBOOT setting if it made the general case simpler and clearer.
include/configs/MPC8540ADS.h | 49 ++++++++++++--------------------- include/configs/MPC8540EVAL.h | 36 +++++++++++------------- include/configs/MPC8541CDS.h | 28 +++++++++--------- include/configs/MPC8544DS.h | 33 +++++++++++----------- include/configs/MPC8548CDS.h | 28 +++++++++--------- include/configs/MPC8555CDS.h | 28 +++++++++--------- include/configs/MPC8560ADS.h | 61 ++++++++++++++--------------------------- include/configs/MPC8568MDS.h | 29 ++++++++++--------- include/configs/PM854.h | 58 ++++++++++++++------------------------- include/configs/PM856.h | 55 +++++++++++++----------------------- include/configs/SBC8540.h | 46 +++++++++++++++--------------- include/configs/TQM85xx.h | 38 +++++++++++++------------ include/configs/sbc8560.h | 44 +++++++++++++++--------------- include/configs/stxgp3.h | 51 +++++++++++++++------------------- include/configs/stxssa.h | 46 ++++++++++++++----------------- 15 files changed, 280 insertions(+), 350 deletions(-)
include/configs/MPC8540ADS.h +18 -31
@@ -407,37 +407,24 @@#define CONFIG_LOADS_ECHO 1/* echo on for serial download */ #define CFG_LOADS_BAUD_CHANGE 1/* allow baudrate change */ + +/* +* Command line configuration. +*/ +#include <config_cmd_default.h> + +#define CONFIG_CMD_PING +#define CONFIG_CMD_I2C + +#if defined(CONFIG_PCI ) +#define CONFIG_CMD_PCI +#endif +#if defined(CFG_RAMBOOT ) -#if defined(CONFIG_PCI ) -#define CONFIG_COMMANDS ((CONFIG_CMD_DFL \ - | CFG_CMD_PING \ - | CFG_CMD_PCI \ - | CFG_CMD_I2C) \ - & \ - ~(CFG_CMD_ENV \ - | CFG_CMD_LOADS)) -#else -#define CONFIG_COMMANDS ((CONFIG_CMD_DFL \ - | CFG_CMD_PING \ - | CFG_CMD_I2C) \ - & \ - ~(CFG_CMD_ENV \ - | CFG_CMD_LOADS)) -#endif -#else -#if defined(CONFIG_PCI ) -#define CONFIG_COMMANDS (CONFIG_CMD_DFL \ - | CFG_CMD_PCI \ - | CFG_CMD_PING \ - | CFG_CMD_I2C) -#else -#define CONFIG_COMMANDS (CONFIG_CMD_DFL \ - | CFG_CMD_PING \ - | CFG_CMD_I2C) -#endif +#undef CONFIG_CMD_ENV +#undef CONFIG_CMD_LOADS#endif -#include <cmd_confdefs.h> #undef CONFIG_WATCHDOG/* watchdog disabled */
@@ -448,7 +435,7 @@#define CFG_LOAD_ADDR 0x2000000/* default load address */ #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 */
@@ -469,7 +456,7 @@/* Cache Configuration */ #define CFG_DCACHE_SIZE 32768#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
@@ -481,7 +468,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/MPC8540EVAL.h +17 -19
@@ -259,26 +259,24 @@#define CONFIG_LOADS_ECHO 1/* echo on for serial download */ #define CFG_LOADS_BAUD_CHANGE 1/* allow baudrate change */ -#if defined(CFG_RAMBOOT ) || defined(CONFIG_RAM_AS_FLASH ) -#if defined(CONFIG_PCI ) -#define CONFIG_COMMANDS ((CONFIG_CMD_DFL | CFG_CMD_PING \ - | CFG_CMD_PCI | CFG_CMD_I2C ) & \ - ~(CFG_CMD_ENV | CFG_CMD_LOADS )) -#else -#define CONFIG_COMMANDS ((CONFIG_CMD_DFL | CFG_CMD_PING \ - | CFG_CMD_I2C ) & \ - ~(CFG_CMD_ENV | CFG_CMD_LOADS )) -#endif -#else + +/* +* Command line configuration. +*/ +#include <config_cmd_default.h> + +#define CONFIG_CMD_PING +#define CONFIG_CMD_I2C +#if defined(CONFIG_PCI ) -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | CFG_CMD_PCI \ - | CFG_CMD_PING | CFG_CMD_I2C ) -#else -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | CFG_CMD_PING | CFG_CMD_I2C ) +#define CONFIG_CMD_PCI #endif + +#if defined(CFG_RAMBOOT ) || defined(CONFIG_RAM_AS_FLASH ) +#undef CONFIG_CMD_ENV +#undef CONFIG_CMD_LOADS#endif -#include <cmd_confdefs.h> #undef CONFIG_WATCHDOG/* watchdog disabled */
@@ -288,7 +286,7 @@#define CFG_LONGHELP /* undef to save memory */ #define CFG_LOAD_ADDR 0x2000000/* default load address */ #define CFG_PROMPT "MPC8540EVAL=> "/* 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 */
@@ -308,7 +306,7 @@/* Cache Configuration */ #define CFG_DCACHE_SIZE 32768#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
@@ -320,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/MPC8541CDS.h +14 -14
@@ -401,19 +401,19 @@ extern unsigned long get_clock_freq(void);#define CONFIG_LOADS_ECHO 1/* echo on for serial download */ #define CFG_LOADS_BAUD_CHANGE 1/* allow baudrate change */ +/* +* Command line configuration. +*/ +#include <config_cmd_default.h> + +#define CONFIG_CMD_PING +#define CONFIG_CMD_I2C +#define CONFIG_CMD_MII +#if defined(CONFIG_PCI ) -#define CONFIG_COMMANDS (CONFIG_CMD_DFL \ - | CFG_CMD_PCI \ - | CFG_CMD_PING \ - | CFG_CMD_I2C \ - | CFG_CMD_MII) -#else -#define CONFIG_COMMANDS (CONFIG_CMD_DFL \ - | CFG_CMD_PING \ - | CFG_CMD_I2C \ - | CFG_CMD_MII) +#define CONFIG_CMD_PCI #endif -#include <cmd_confdefs.h> +#undef CONFIG_WATCHDOG/* watchdog disabled */
@@ -423,7 +423,7 @@ extern unsigned long get_clock_freq(void);#define CFG_LONGHELP /* undef to save memory */ #define CFG_LOAD_ADDR 0x2000000/* default load address */ #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 */
@@ -443,7 +443,7 @@ extern unsigned long get_clock_freq(void);/* Cache Configuration */ #define CFG_DCACHE_SIZE 32768#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
@@ -455,7 +455,7 @@ extern unsigned long get_clock_freq(void);#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/MPC8544DS.h +17 -16
@@ -392,21 +392,22 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);#define CONFIG_LOADS_ECHO 1/* echo on for serial download */ #define CFG_LOADS_BAUD_CHANGE 1/* allow baudrate change */ + +/* +* Command line configuration. +*/ +#include <config_cmd_default.h> + +#define CONFIG_CMD_PING +#define CONFIG_CMD_I2C +#define CONFIG_CMD_MII +#if defined(CONFIG_PCI ) -#define CONFIG_COMMANDS (CONFIG_CMD_DFL \ - | CFG_CMD_PCI \ - | CFG_CMD_PING \ - | CFG_CMD_I2C \ - | CFG_CMD_MII \ - | CFG_CMD_BEDBUG \ - | CFG_CMD_NET) -#else -#define CONFIG_COMMANDS (CONFIG_CMD_DFL \ - | CFG_CMD_PING \ - | CFG_CMD_I2C \ - | CFG_CMD_MII) +#define CONFIG_CMD_PCI +#define CONFIG_CMD_BEDBUG +#define CONFIG_CMD_NET #endif -#include <cmd_confdefs.h> +#undef CONFIG_WATCHDOG/* watchdog disabled */
@@ -416,7 +417,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);#define CFG_LONGHELP /* undef to save memory */ #define CFG_LOAD_ADDR 0x2000000/* default load address */ #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 */
@@ -436,7 +437,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);/* Cache Configuration */ #define CFG_DCACHE_SIZE 32768#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
@@ -448,7 +449,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);#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/MPC8548CDS.h +14 -14
@@ -427,19 +427,19 @@ extern unsigned long get_clock_freq(void);#define CONFIG_LOADS_ECHO 1/* echo on for serial download */ #define CFG_LOADS_BAUD_CHANGE 1/* allow baudrate change */ +/* +* Command line configuration. +*/ +#include <config_cmd_default.h> + +#define CONFIG_CMD_PING +#define CONFIG_CMD_I2C +#define CONFIG_CMD_MII +#if defined(CONFIG_PCI ) -#define CONFIG_COMMANDS (CONFIG_CMD_DFL \ - | CFG_CMD_PCI \ - | CFG_CMD_PING \ - | CFG_CMD_I2C \ - | CFG_CMD_MII) -#else -#define CONFIG_COMMANDS (CONFIG_CMD_DFL \ - | CFG_CMD_PING \ - | CFG_CMD_I2C \ - | CFG_CMD_MII) +#define CONFIG_CMD_PCI #endif -#include <cmd_confdefs.h> +#undef CONFIG_WATCHDOG/* watchdog disabled */
@@ -449,7 +449,7 @@ extern unsigned long get_clock_freq(void);#define CFG_LONGHELP /* undef to save memory */ #define CFG_LOAD_ADDR 0x2000000/* default load address */ #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 */
@@ -469,7 +469,7 @@ extern unsigned long get_clock_freq(void);/* Cache Configuration */ #define CFG_DCACHE_SIZE 32768#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
@@ -481,7 +481,7 @@ extern unsigned long get_clock_freq(void);#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/MPC8555CDS.h +14 -14
@@ -401,19 +401,19 @@ extern unsigned long get_clock_freq(void);#define CONFIG_LOADS_ECHO 1/* echo on for serial download */ #define CFG_LOADS_BAUD_CHANGE 1/* allow baudrate change */ +/* +* Command line configuration. +*/ +#include <config_cmd_default.h> + +#define CONFIG_CMD_PING +#define CONFIG_CMD_I2C +#define CONFIG_CMD_MII +#if defined(CONFIG_PCI ) -#define CONFIG_COMMANDS (CONFIG_CMD_DFL \ - | CFG_CMD_PCI \ - | CFG_CMD_PING \ - | CFG_CMD_I2C \ - | CFG_CMD_MII) -#else -#define CONFIG_COMMANDS (CONFIG_CMD_DFL \ - | CFG_CMD_PING \ - | CFG_CMD_I2C \ - | CFG_CMD_MII) +#define CONFIG_CMD_PCI #endif -#include <cmd_confdefs.h> +#undef CONFIG_WATCHDOG/* watchdog disabled */
@@ -423,7 +423,7 @@ extern unsigned long get_clock_freq(void);#define CFG_LONGHELP /* undef to save memory */ #define CFG_LOAD_ADDR 0x2000000/* default load address */ #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 */
@@ -443,7 +443,7 @@ extern unsigned long get_clock_freq(void);/* Cache Configuration */ #define CFG_DCACHE_SIZE 32768#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
@@ -455,7 +455,7 @@ extern unsigned long get_clock_freq(void);#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/MPC8560ADS.h +21 -40
88 lines not on this page · raw message
include/configs/MPC8568MDS.h +15 -14
@@ -383,19 +383,20 @@ extern unsigned long get_clock_freq(void);#define CONFIG_LOADS_ECHO 1/* echo on for serial download */ #define CFG_LOADS_BAUD_CHANGE 1/* allow baudrate change */ + +/* +* Command line configuration. +*/ +#include <config_cmd_default.h> + +#define CONFIG_CMD_PING +#define CONFIG_CMD_I2C +#define CONFIG_CMD_MII +#if defined(CONFIG_PCI ) -#define CONFIG_COMMANDS (CONFIG_CMD_DFL \ - | CFG_CMD_PCI \ - | CFG_CMD_PING \ - | CFG_CMD_I2C \ - | CFG_CMD_MII) -#else -#define CONFIG_COMMANDS (CONFIG_CMD_DFL \ - | CFG_CMD_PING \ - | CFG_CMD_I2C \ - | CFG_CMD_MII) +#define CONFIG_CMD_PCI #endif -#include <cmd_confdefs.h> +#undef CONFIG_WATCHDOG/* watchdog disabled */
@@ -405,7 +406,7 @@ extern unsigned long get_clock_freq(void);#define CFG_LONGHELP /* undef to save memory */ #define CFG_LOAD_ADDR 0x2000000/* default load address */ #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 */
@@ -425,7 +426,7 @@ extern unsigned long get_clock_freq(void);/* Cache Configuration */ #define CFG_DCACHE_SIZE 32768#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
@@ -437,7 +438,7 @@ extern unsigned long get_clock_freq(void);#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/PM854.h +21 -37
85 lines not on this page · raw message
include/configs/PM856.h +20 -35
82 lines not on this page · raw message
include/configs/SBC8540.h +23 -23
72 lines not on this page · raw message
include/configs/TQM85xx.h +20 -18
@@ -357,24 +357,26 @@#define CONFIG_TIMESTAMP /* Print image info with ts */ + +/* +* Command line configuration. +*/ +#include <config_cmd_default.h> + +#define CONFIG_CMD_PING +#define CONFIG_CMD_I2C +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_NFS +#define CONFIG_CMD_SNTP +#define CONFIG_CMD_DATE +#define CONFIG_CMD_EEPROM +#define CONFIG_CMD_DTT +#define CONFIG_CMD_MII +#if defined(CONFIG_PCI ) -# define ADD_PCI_CMD (CFG_CMD_PCI) -#else -# define ADD_PCI_CMD 0 +#define CONFIG_CMD_PCI #endif -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ - CFG_CMD_DHCP | \ - CFG_CMD_NFS | \ - CFG_CMD_SNTP | \ - ADD_PCI_CMD | \ - CFG_CMD_I2C | \ - CFG_CMD_DATE | \ - CFG_CMD_EEPROM | \ - CFG_CMD_DTT | \ - CFG_CMD_MII | \ - CFG_CMD_PING ) -#include <cmd_confdefs.h> #undef CONFIG_WATCHDOG/* watchdog disabled */
@@ -385,7 +387,7 @@#define CFG_LOAD_ADDR 0x2000000/* default load address */ #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 */
@@ -406,7 +408,7 @@/* Cache Configuration */ #define CFG_DCACHE_SIZE 32768#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
@@ -418,7 +420,7 @@#define BOOTFLAG_COLD 0x01/* 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/sbc8560.h +22 -22
71 lines not on this page · raw message
include/configs/stxgp3.h +23 -28
78 lines not on this page · raw message
include/configs/stxssa.h +21 -25
55 lines not on this page · raw message
Signature · 1 line
1.5.2.1.239.g75d8