patch-2.3.41 linux/arch/ppc/xmon/start.c

• Lines: 43
• Date: Tue Jan 25 11:17:07 2000
• Orig file: v2.3.40/linux/arch/ppc/xmon/start.c
• Orig date: Tue Jan 11 22:31:38 2000

diff -u --recursive --new-file v2.3.40/linux/arch/ppc/xmon/start.c linux/arch/ppc/xmon/start.c
@@ -70,7 +70,7 @@
 		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 @@
 		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 @@
 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 @@
 		sccd[3] = 3; eieio();		/* LCR = 8N1 */
 		sccd[1] = 0; eieio();		/* IER = 0 */
 	}
-	else
+	else if ( _machine == _MACH_Pmac )
 	{
 		int i, x;