diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-04-27 23:02:12 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-04-27 23:02:12 +0200 |
| commit | 8e98f5f70b269a77416a990b90ad8d853c5a0d73 (patch) | |
| tree | ee7332a16533f59cdc111bdf8796179333aaede9 /common | |
| parent | c303176aa0cf8c5fc38e7c2d5e181e89cca72ef6 (diff) | |
| parent | 29fd7ceb3c1cb7ffaffce1047e806d1e85e3ab4b (diff) | |
| download | u-boot-imx-8e98f5f70b269a77416a990b90ad8d853c5a0d73.zip u-boot-imx-8e98f5f70b269a77416a990b90ad8d853c5a0d73.tar.gz u-boot-imx-8e98f5f70b269a77416a990b90ad8d853c5a0d73.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc5xxx
Diffstat (limited to 'common')
| -rw-r--r-- | common/serial.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/common/serial.c b/common/serial.c index 5f9ffd7..754e329 100644 --- a/common/serial.c +++ b/common/serial.c @@ -59,6 +59,14 @@ struct serial_device *__default_serial_console (void) #else return &serial0_device; #endif +#elif defined(CONFIG_MPC512X) +#if (CONFIG_PSC_CONSOLE == 3) + return &serial3_device; +#elif (CONFIG_PSC_CONSOLE == 6) + return &serial6_device; +#else +#error "Bad CONFIG_PSC_CONSOLE." +#endif #elif defined(CONFIG_S3C2410) #if defined(CONFIG_SERIAL1) return &s3c24xx_serial0_device; @@ -159,6 +167,20 @@ void serial_initialize (void) serial_register(&s5pc1xx_serial2_device); serial_register(&s5pc1xx_serial3_device); #endif +#if defined(CONFIG_MPC512X) +#if defined(CONFIG_SYS_PSC1) + serial_register(&serial1_device); +#endif +#if defined(CONFIG_SYS_PSC3) + serial_register(&serial3_device); +#endif +#if defined(CONFIG_SYS_PSC4) + serial_register(&serial4_device); +#endif +#if defined(CONFIG_SYS_PSC6) + serial_register(&serial6_device); +#endif +#endif serial_assign (default_serial_console ()->name); } @@ -174,6 +196,7 @@ void serial_stdio_init (void) dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT; dev.start = s->init; + dev.stop = s->uninit; dev.putc = s->putc; dev.puts = s->puts; dev.getc = s->getc; |