summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorwdenk <wdenk>2005-03-31 18:42:15 +0000
committerwdenk <wdenk>2005-03-31 18:42:15 +0000
commit83e40ba75d7f8d0c2e2ecdd203db96ccd79a0340 (patch)
treec744211f014f6ba34b524c98f78d624e554261f0 /common
parent0c1c117cf18ffa3fdc0342dfc47c6003fc5fc5a0 (diff)
downloadu-boot-83e40ba75d7f8d0c2e2ecdd203db96ccd79a0340.tar.gz
u-boot-83e40ba75d7f8d0c2e2ecdd203db96ccd79a0340.tar.xz
u-boot-83e40ba75d7f8d0c2e2ecdd203db96ccd79a0340.zip
* Patch by Detlev Zundel, 31 Mar 2005:
Cleanup duplicate definition of overwrite_console() * Update TQM5200 configuration; prepare for Rev. 200 starter kit boards
Diffstat (limited to 'common')
-rw-r--r--common/console.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/common/console.c b/common/console.c
index 8dbd8e3891..3c535d23d6 100644
--- a/common/console.c
+++ b/common/console.c
@@ -39,11 +39,9 @@ int console_changed = 0;
*/
#ifdef CFG_CONSOLE_OVERWRITE_ROUTINE
extern int overwrite_console (void);
+#define OVERWRITE_CONSOLE overwrite_console ()
#else
-int overwrite_console (void)
-{
- return (0);
-}
+#define OVERWRITE_CONSOLE 0
#endif /* CFG_CONSOLE_OVERWRITE_ROUTINE */
#endif /* CFG_CONSOLE_IS_IN_ENV */
@@ -429,7 +427,7 @@ int console_init_r (void)
stdoutname = getenv ("stdout");
stderrname = getenv ("stderr");
- if (overwrite_console () == 0) { /* if not overwritten by config switch */
+ if (OVERWRITE_CONSOLE == 0) { /* if not overwritten by config switch */
inputdev = search_device (DEV_FLAGS_INPUT, stdinname);
outputdev = search_device (DEV_FLAGS_OUTPUT, stdoutname);
errdev = search_device (DEV_FLAGS_OUTPUT, stderrname);