diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-03-02 02:54:52 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-03-02 02:54:52 +0000 |
| commit | d1c4bfb274b19170d240e01a0912661c518f9109 (patch) | |
| tree | 4936530f8997dfc4dabfb3ee2a1683508e050940 /arch/mips/mips-boards | |
| parent | 25c4e85bb6549566ce88b4b012d05a8d7ed6fe1b (diff) | |
Serial console fixes from Alice Hennessy.
Diffstat (limited to 'arch/mips/mips-boards')
| -rw-r--r-- | arch/mips/mips-boards/malta/malta_setup.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/arch/mips/mips-boards/malta/malta_setup.c b/arch/mips/mips-boards/malta/malta_setup.c index 944c35e51..6b362b0ab 100644 --- a/arch/mips/mips-boards/malta/malta_setup.c +++ b/arch/mips/mips-boards/malta/malta_setup.c @@ -113,19 +113,12 @@ void __init malta_setup(void) enable_dma(4); #ifdef CONFIG_SERIAL_CONSOLE - argptr = prom_getcmdline(); - if ((argptr = strstr(argptr, "console=ttyS0")) == NULL) - { - int i=0; - char *s = prom_getenv("modetty0"); - while(s[i] >= '0' && s[i] <= '9') - i++; - strcpy(serial_console, "ttyS0,"); - strncpy(serial_console + 6, s, i); - prom_printf("Config serial console: %s\n", serial_console); - console_setup(serial_console, NULL); + argptr = prom_getcmdline(); + if ((argptr = strstr(argptr, "console=")) == NULL) { + argptr = prom_getcmdline(); + strcat(argptr, " console=ttyS0,38400"); } -#endif +#endif #ifdef CONFIG_REMOTE_DEBUG argptr = prom_getcmdline(); |