diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-06-30 19:32:25 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-06-30 19:32:25 +0200 |
| commit | 3b5f61a02579026f0588b5dac3bb1c507b6fa53f (patch) | |
| tree | 53c593882aee7938f94b0b3bdc0b6e50fdfe2ad6 /common/serial.c | |
| parent | a63c31cff5147f1eca19d884ee120005775fbffc (diff) | |
| parent | bba68377320608b3c3f7c0fef30452bdaa8b0408 (diff) | |
Merge with /home/m8/git/u-boot
Diffstat (limited to 'common/serial.c')
| -rw-r--r-- | common/serial.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/common/serial.c b/common/serial.c index 7b29951708..38057d21f6 100644 --- a/common/serial.c +++ b/common/serial.c @@ -42,7 +42,11 @@ struct serial_device *default_serial_console (void) return &serial_scc_device; #elif defined(CONFIG_405GP) || defined(CONFIG_405CR) || defined(CONFIG_440) \ || defined(CONFIG_405EP) || defined(CONFIG_MPC5xxx) - return &serial0_device; +#if defined(CONFIG_UART1_CONSOLE) + return &serial1_device; +#else + return &serial0_device; +#endif #else #error No default console #endif |