diff options
| author | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 1998-09-26 12:25:03 +0000 |
|---|---|---|
| committer | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 1998-09-26 12:25:03 +0000 |
| commit | c272714c76e8b6cef1dd2a78bdeed26bb3899dc2 (patch) | |
| tree | 6b6b3d7fb4fd77356ac8f5a543e13dade88be3c0 | |
| parent | bb891111126d978e543061f1d54f0b7b549608aa (diff) | |
map prom console settings. d1 -> ttyS1 and d2 -> ttyS0
| -rw-r--r-- | arch/mips/sgi/kernel/setup.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/arch/mips/sgi/kernel/setup.c b/arch/mips/sgi/kernel/setup.c index 04ab84640..914e81093 100644 --- a/arch/mips/sgi/kernel/setup.c +++ b/arch/mips/sgi/kernel/setup.c @@ -1,4 +1,4 @@ -/* $Id: setup.c,v 1.13 1998/08/25 09:14:50 ralf Exp $ +/* $Id: setup.c,v 1.14 1998/09/19 19:16:19 ralf Exp $ * * setup.c: SGI specific setup, including init of the feature struct. * @@ -25,8 +25,6 @@ #include <asm/sgihpc.h> #include <asm/sgint23.h> -extern int serial_console; /* in sgiserial.c */ - extern struct rtc_ops indy_rtc_ops; void indy_reboot_setup(void); @@ -114,18 +112,11 @@ __initfunc(void sgi_setup(void)) * line and "d2" for the second serial line. */ ctype = prom_getenv("console"); - serial_console = 0; if(*ctype == 'd') { - if(*(ctype+1)=='2') - serial_console = 1; + if(*(ctype+1)=='1') + console_setup ("ttyS1"); else - serial_console = 2; - if(!serial_console) { - prom_printf("Weird console env setting %s\n", ctype); - prom_printf("Press a key to reboot.\n"); - prom_getchar(); - prom_imode(); - } + console_setup ("ttyS0"); } #endif |