diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
| commit | b9558d5f86c471a125abf1fb3a3882fb053b1f8c (patch) | |
| tree | 707b53ec64e740a7da87d5f36485e3cd9b1c794e /arch/ppc/xmon | |
| parent | b3ac367c7a3e6047abe74817db27e34e759f279f (diff) | |
Merge with Linux 2.3.41.
Diffstat (limited to 'arch/ppc/xmon')
| -rw-r--r-- | arch/ppc/xmon/start.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/arch/ppc/xmon/start.c b/arch/ppc/xmon/start.c index 426f80ff3..9ed5f3805 100644 --- a/arch/ppc/xmon/start.c +++ b/arch/ppc/xmon/start.c @@ -70,7 +70,7 @@ xmon_map_scc(void) sccd = sccc + (0xf3013030 - 0xf3013020); #endif } - else + else if ( _machine & _MACH_chrp ) { /* should already be mapped by the kernel boot */ sccc = (volatile unsigned char *) (isa_io_base + 0x3fd); @@ -78,6 +78,15 @@ xmon_map_scc(void) TXRDY = 0x20; RXRDY = 1; } + else if ( _machine & _MACH_gemini ) + { + /* should already be mapped by the kernel boot */ + sccc = (volatile unsigned char *) 0xffeffb0d; + sccd = (volatile unsigned char *) 0xffeffb08; + TXRDY = 0x20; + RXRDY = 1; + console = 1; + } } static int scc_initialized = 0; @@ -226,7 +235,7 @@ static unsigned char scc_inittab[] = { void xmon_init_scc() { - if ( _machine == _MACH_chrp ) + if ( _machine & (_MACH_chrp|_MACH_gemini) ) { sccd[3] = 0x83; eieio(); /* LCR = 8N1 + DLAB */ sccd[0] = 3; eieio(); /* DLL = 38400 baud */ @@ -235,7 +244,7 @@ xmon_init_scc() sccd[3] = 3; eieio(); /* LCR = 8N1 */ sccd[1] = 0; eieio(); /* IER = 0 */ } - else + else if ( _machine == _MACH_Pmac ) { int i, x; |