patch-2.4.22 linux-2.4.22/arch/mips/mips-boards/malta/malta_setup.c
Next file: linux-2.4.22/arch/mips/mips-boards/sead/sead_int.c
Previous file: linux-2.4.22/arch/mips/mips-boards/malta/malta_int.c
Back to the patch index
Back to the overall index
- Lines: 74
- Date:
2003-08-25 04:44:40.000000000 -0700
- Orig file:
linux-2.4.21/arch/mips/mips-boards/malta/malta_setup.c
- Orig date:
2002-11-28 15:53:10.000000000 -0800
diff -urN linux-2.4.21/arch/mips/mips-boards/malta/malta_setup.c linux-2.4.22/arch/mips/mips-boards/malta/malta_setup.c
@@ -50,11 +50,9 @@
char serial_console[20];
#endif
-#ifdef CONFIG_REMOTE_DEBUG
-extern void set_debug_traps(void);
+#ifdef CONFIG_KGDB
extern void rs_kgdb_hook(int);
-extern void breakpoint(void);
-static int remote_debug = 0;
+int remote_debug = 0;
#endif
extern struct ide_ops std_ide_ops;
@@ -64,9 +62,6 @@
extern void mips_reboot_setup(void);
-extern void (*board_time_init)(void);
-extern void (*board_timer_setup)(struct irqaction *irq);
-extern unsigned long (*rtc_get_time)(void);
extern void mips_time_init(void);
extern void mips_timer_setup(struct irqaction *irq);
extern unsigned long mips_rtc_get_time(void);
@@ -85,17 +80,13 @@
return "MIPS Malta";
}
-void __init bus_error_init(void)
-{
-}
-
void __init malta_setup(void)
{
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
int rs_putDebugChar(char);
char rs_getDebugChar(void);
- extern int (*putDebugChar)(char);
- extern char (*getDebugChar)(void);
+ extern int (*generic_putDebugChar)(char);
+ extern char (*generic_getDebugChar)(void);
#endif
char *argptr;
int i;
@@ -117,7 +108,7 @@
}
#endif
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
argptr = prom_getcmdline();
if ((argptr = strstr(argptr, "kgdb=ttyS")) != NULL) {
int line;
@@ -130,8 +121,8 @@
line ? 1 : 0);
rs_kgdb_hook(line);
- putDebugChar = rs_putDebugChar;
- getDebugChar = rs_getDebugChar;
+ generic_putDebugChar = rs_putDebugChar;
+ generic_getDebugChar = rs_getDebugChar;
prom_printf("KGDB: Using serial line /dev/ttyS%d for session, "
"please connect your debugger\n", line ? 1 : 0);
@@ -143,7 +134,7 @@
argptr = prom_getcmdline();
if ((argptr = strstr(argptr, "nofpu")) != NULL)
- mips_cpu.options &= ~MIPS_CPU_FPU;
+ cpu_data[0].options &= ~MIPS_CPU_FPU;
rtc_ops = &malta_rtc_ops;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)