--- zzzz-none-000/linux-2.4.17/arch/mips/gt64120/momenco_ocelot/dbg_io.c	2001-09-09 17:43:01.000000000 +0000
+++ sangam-fb-322/linux-2.4.17/arch/mips/gt64120/momenco_ocelot/dbg_io.c	2004-11-24 13:22:39.000000000 +0000
@@ -2,6 +2,8 @@
 
 #if defined(CONFIG_REMOTE_DEBUG)
 
+#include <asm/serial.h> /* For the serial port location and base baud */
+
 /* --- CONFIG --- */
 
 typedef unsigned char uint8;
@@ -36,8 +38,8 @@
 /* === CONFIG === */
 
 /* [jsun] we use the second serial port for kdb */
-#define         BASE                    0xbd000020
-#define         MAX_BAUD                115200
+#define         BASE                    OCELOT_SERIAL1_BASE
+#define         MAX_BAUD                OCELOT_BASE_BAUD
 
 /* === END OF CONFIG === */
 
@@ -111,7 +113,7 @@
 {
 	if (!remoteDebugInitialized) {
 		remoteDebugInitialized = 1;
-		debugInit(UART16550_BAUD_9600,
+		debugInit(UART16550_BAUD_38400,
 			  UART16550_DATA_8BIT,
 			  UART16550_PARITY_NONE, UART16550_STOP_1BIT);
 	}