diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-07-06 10:38:28 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-07-06 10:38:28 +0200 |
| commit | dcc0264878406d52b879d2e5a63d3d793371434e (patch) | |
| tree | 3a2d693997fad34fd049a56518dbb44195342392 /include/configs/MPC8260ADS.h | |
| parent | 6b0a174a1e6f55e1f5a1fbb223cdad7645a4646e (diff) | |
| parent | e4dbe1b215f5c6c462e76909d240bd96472b84de (diff) | |
| download | u-boot-imx-dcc0264878406d52b879d2e5a63d3d793371434e.zip u-boot-imx-dcc0264878406d52b879d2e5a63d3d793371434e.tar.gz u-boot-imx-dcc0264878406d52b879d2e5a63d3d793371434e.tar.bz2 | |
Merge with git://www.denx.de/git/u-boot-testing
Diffstat (limited to 'include/configs/MPC8260ADS.h')
| -rw-r--r-- | include/configs/MPC8260ADS.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h index aaecd38..69d4c28 100644 --- a/include/configs/MPC8260ADS.h +++ b/include/configs/MPC8260ADS.h @@ -246,13 +246,11 @@ #endif /* CONFIG_ADSTYPE >= CFG_PQ2FADS */ - - #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ #define CONFIG_BOOTCOMMAND "bootm fff80000" /* autoboot command */ #define CONFIG_BOOTARGS "root=/dev/mtdblock2" -#if defined(CONFIG_CMD_KGDB) +#if defined(CONFIG_CMD_KGDB) || (CONFIG_COMMANDS & CFG_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 */ @@ -270,7 +268,7 @@ #define CFG_PROMPT_HUSH_PS2 "> " #define CFG_LONGHELP /* undef to save memory */ #define CFG_PROMPT "=> " /* Monitor Command Prompt */ -#if defined(CONFIG & CFG_CMD_KGDB) +#if defined(CONFIG_CMD_KGDB) || (CONFIG_COMMANDS & CFG_CMD_KGDB) #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */ #else #define CFG_CBSIZE 256 /* Console I/O Buffer Size */ |