diff options
| author | Jon Loeliger <jdl@freescale.com> | 2008-02-13 16:03:20 -0600 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2008-02-13 16:03:20 -0600 |
| commit | d075eec500acffed5fa404a45a3e12e158d0cb33 (patch) | |
| tree | 2cecaae4e1c324827caa65d6c5215642ed4a91ed /common/serial.c | |
| parent | 60c1b95aabbfac17b0ea9422828784e163348c5c (diff) | |
| parent | 10bbb38a402a2faf18858c451bcdc63d45888e6e (diff) | |
| download | u-boot-imx-d075eec500acffed5fa404a45a3e12e158d0cb33.zip u-boot-imx-d075eec500acffed5fa404a45a3e12e158d0cb33.tar.gz u-boot-imx-d075eec500acffed5fa404a45a3e12e158d0cb33.tar.bz2 | |
Merge commit 'wd/master'
Diffstat (limited to 'common/serial.c')
| -rw-r--r-- | common/serial.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/common/serial.c b/common/serial.c index 5601080..bfda7ca 100644 --- a/common/serial.c +++ b/common/serial.c @@ -60,6 +60,16 @@ struct serial_device *__default_serial_console (void) #else return &serial0_device; #endif +#elif defined(CONFIG_S3C2410) +#if defined(CONFIG_SERIAL1) + return &s3c24xx_serial0_device; +#elif defined(CONFIG_SERIAL2) + return &s3c24xx_serial1_device; +#elif defined(CONFIG_SERIAL3) + return &s3c24xx_serial2_device; +#else +#error "CONFIG_SERIAL? missing." +#endif #else #error No default console #endif @@ -123,6 +133,11 @@ void serial_initialize (void) #if defined (CONFIG_STUART) serial_register(&serial_stuart_device); #endif +#if defined(CONFIG_S3C2410) + serial_register(&s3c24xx_serial0_device); + serial_register(&s3c24xx_serial1_device); + serial_register(&s3c24xx_serial2_device); +#endif serial_assign (default_serial_console ()->name); } |