Skip to contentSkip to conversation

rename CONFIG_REMOTE_DEBUG and CONFIG_DEBUG

PATCH New Jun Sun 4 participants 8 messages Feb 20, 2003 – Mar 7, 2003

Subsystems (3)
Documentation MIPS Char and misc drivers
lore
Share & tools
lore

Jun Sun

author
#0 lore raw

PATCH 1/1 rename CONFIG_REMOTE_DEBUG and CONFIG_DEBUG

This patch make the following changes

1) CONFIG_REMOTE_DEBUG -> CONFIG_KGDB
2) CONFIG_DEBUG -> CONFIG_RUNTIME_DEBUG

MIPS is pretty much the only one (other than the pitiful s390 :0) using REMOTE_DEBUG instead of KGDB. So it is a good thing to change it.

As Keith pointed out, CONFIG_DEBUG is too general (which has already caused confusion, BTW). RUNTIME_DEBUG is more appropriate.

Jun

Documentation/Configure.help renamed from Documentation/Configure.help.orig +3 -3
diff -Nru linux/Documentation/Configure.help.orig linux/Documentation/Configure.help
@@ -20483,10 +20483,10 @@
   Don't turn this on unless you know what you are doing.
 
 Enable run-time debugging
-CONFIG_DEBUG
+CONFIG_RUNTIME_DEBUG
   If you say Y here, some debugging macros will do run-time checking.
-  If you say N here, those macros will mostly turn to no-ops.  For
-  MIPS boards only.  See include/asm-mips/debug.h for debuging macros.
+  If you say N here, those macros will mostly turn to no-ops.  Currently
+  supported by MIPS arch.  See include/asm-mips/debug.h for debuging macros.
   If unsure, say N.
 
 Remote GDB kernel debugging
arch/mips/au1000/common/Makefile renamed from arch/mips/au1000/common/Makefile.orig +1 -1
diff -Nru linux/arch/mips/au1000/common/Makefile.orig linux/arch/mips/au1000/common/Makefile
@@ -23,7 +23,7 @@
 
 obj-$(CONFIG_AU1X00_UART) += serial.o
 obj-$(CONFIG_AU1000_USB_DEVICE) += usbdev.o
-obj-$(CONFIG_REMOTE_DEBUG) += dbg_io.o
+obj-$(CONFIG_KGDB) += dbg_io.o
 obj-$(CONFIG_RTC) += rtc.o
 
 include $(TOPDIR)/Rules.make
arch/mips/au1000/common/dbg_io.c renamed from arch/mips/au1000/common/dbg_io.c.orig +1 -1
diff -Nru linux/arch/mips/au1000/common/dbg_io.c.orig linux/arch/mips/au1000/common/dbg_io.c
@@ -3,7 +3,7 @@
 #include <asm/io.h>
 #include <asm/au1000.h>
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 
 /*
  * FIXME the user should be able to select the
arch/mips/au1000/common/irq.c renamed from arch/mips/au1000/common/irq.c.orig +2 -2
diff -Nru linux/arch/mips/au1000/common/irq.c.orig linux/arch/mips/au1000/common/irq.c
@@ -77,7 +77,7 @@
 #define EXT_INTC1_REQ1 5 /* IP 5 */
 #define MIPS_TIMER_IP  7 /* IP 7 */
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 extern void breakpoint(void);
 #endif
 

@@ -507,7 +507,7 @@
 	}
 
 	set_c0_status(ALLINTS);
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	/* If local serial I/O used for debug port, enter kgdb at once */
 	puts("Waiting for kgdb to connect...");
 	set_debug_traps();
arch/mips/au1000/common/serial.c renamed from arch/mips/au1000/common/serial.c.orig +1 -1
diff -Nru linux/arch/mips/au1000/common/serial.c.orig linux/arch/mips/au1000/common/serial.c
@@ -987,7 +987,7 @@
 		set_bit(TTY_IO_ERROR, &info->tty->flags);
 
 	info->flags &= ~ASYNC_INITIALIZED;
-#ifndef CONFIG_REMOTE_DEBUG
+#ifndef CONFIG_KGDB
 	au_writel(0, UART_MOD_CNTRL + state->port);
 	au_sync_delay(10);
 #endif
arch/mips/baget/vacserial.c renamed from arch/mips/baget/vacserial.c.orig +2 -2
diff -Nru linux/arch/mips/baget/vacserial.c.orig linux/arch/mips/baget/vacserial.c
@@ -2790,7 +2790,7 @@
 }
 #endif
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 #undef PRINT_DEBUG_PORT_INFO
 
 /*

@@ -2902,4 +2902,4 @@
 	return(serial_inp(info, VAC_UART_RX));
 }
 
-#endif /* CONFIG_REMOTE_DEBUG */
+#endif /* CONFIG_KGDB */
arch/mips/ddb5074/irq.c renamed from arch/mips/ddb5074/irq.c.orig +1 -1
diff -Nru linux/arch/mips/ddb5074/irq.c.orig linux/arch/mips/ddb5074/irq.c
@@ -210,7 +210,7 @@
 
 void __init ddb_irq_setup(void)
 {
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	if (remote_debug)
 		set_debug_traps();
 	breakpoint();		/* you may move this line to whereever you want :-) */
arch/mips/ddb5074/setup.c renamed from arch/mips/ddb5074/setup.c.orig +1 -1
diff -Nru linux/arch/mips/ddb5074/setup.c.orig linux/arch/mips/ddb5074/setup.c
@@ -28,7 +28,7 @@
 #include <asm/traps.h>
 
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 extern void rs_kgdb_hook(int);
 extern void breakpoint(void);
 #endif
arch/mips/ddb5xxx/common/irq.c renamed from arch/mips/ddb5xxx/common/irq.c.orig +1 -1
diff -Nru linux/arch/mips/ddb5xxx/common/irq.c.orig linux/arch/mips/ddb5xxx/common/irq.c
@@ -19,7 +19,7 @@
 
 void __init init_IRQ(void)
 {
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	extern void breakpoint(void);
 	extern void set_debug_traps(void);
arch/mips/ddb5xxx/ddb5074/irq.c renamed from arch/mips/ddb5xxx/ddb5074/irq.c.orig +1 -1
diff -Nru linux/arch/mips/ddb5xxx/ddb5074/irq.c.orig linux/arch/mips/ddb5xxx/ddb5074/irq.c
@@ -142,7 +142,7 @@
 
 void __init ddb_irq_setup(void)
 {
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	if (remote_debug)
 		set_debug_traps();
 	breakpoint();		/* you may move this line to whereever you want :-) */
arch/mips/ddb5xxx/ddb5074/setup.c renamed from arch/mips/ddb5xxx/ddb5074/setup.c.orig +1 -1
diff -Nru linux/arch/mips/ddb5xxx/ddb5074/setup.c.orig linux/arch/mips/ddb5xxx/ddb5074/setup.c
@@ -31,7 +31,7 @@
 #include <asm/ddb5xxx/ddb5xxx.h>
 
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 extern void rs_kgdb_hook(int);
 extern void breakpoint(void);
 #endif
arch/mips/ddb5xxx/ddb5074/pci_ops.c renamed from arch/mips/ddb5xxx/ddb5074/pci_ops.c.orig +1 -1
diff -Nru linux/arch/mips/ddb5xxx/ddb5074/pci_ops.c.orig linux/arch/mips/ddb5xxx/ddb5074/pci_ops.c
@@ -281,7 +281,7 @@
 };
 
 
-#if defined(CONFIG_DEBUG)
+#if defined(CONFIG_RUNTIME_DEBUG)
 void jsun_scan_pci_bus(void)
 {
 	struct pci_bus bus;
arch/mips/ddb5xxx/ddb5476/Makefile renamed from arch/mips/ddb5xxx/ddb5476/Makefile.orig +1 -1
diff -Nru linux/arch/mips/ddb5xxx/ddb5476/Makefile.orig linux/arch/mips/ddb5xxx/ddb5476/Makefile
@@ -15,6 +15,6 @@
 
 obj-y				+= setup.o irq.o int-handler.o pci.o pci_ops.o \
 				   nile4_pic.o vrc5476_irq.o
-obj-$(CONFIG_REMOTE_DEBUG)	+= dbg_io.o
+obj-$(CONFIG_KGDB)	+= dbg_io.o
 
 include $(TOPDIR)/Rules.make
arch/mips/ddb5xxx/ddb5476/setup.c renamed from arch/mips/ddb5xxx/ddb5476/setup.c.orig +1 -1
diff -Nru linux/arch/mips/ddb5xxx/ddb5476/setup.c.orig linux/arch/mips/ddb5xxx/ddb5476/setup.c
@@ -41,7 +41,7 @@
 #define TIMER_IRQ			(VRC5476_IRQ_BASE + VRC5476_IRQ_GPT)
 #endif
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 extern void breakpoint(void);
 #endif
arch/mips/ddb5xxx/ddb5476/pci.c renamed from arch/mips/ddb5xxx/ddb5476/pci.c.orig +1 -1
diff -Nru linux/arch/mips/ddb5xxx/ddb5476/pci.c.orig linux/arch/mips/ddb5xxx/ddb5476/pci.c
@@ -100,7 +100,7 @@
 	}
 }
 
-#if defined(CONFIG_DEBUG)
+#if defined(CONFIG_RUNTIME_DEBUG)
 extern void jsun_scan_pci_bus(void);
 #endif
arch/mips/ddb5xxx/ddb5476/pci_ops.c renamed from arch/mips/ddb5xxx/ddb5476/pci_ops.c.orig +1 -1
diff -Nru linux/arch/mips/ddb5xxx/ddb5476/pci_ops.c.orig linux/arch/mips/ddb5xxx/ddb5476/pci_ops.c
@@ -296,7 +296,7 @@
 };
 
 
-#if defined(CONFIG_DEBUG)
+#if defined(CONFIG_RUNTIME_DEBUG)
 void jsun_scan_pci_bus(void)
 {
 	struct pci_bus bus;
arch/mips/ddb5xxx/ddb5477/Makefile renamed from arch/mips/ddb5xxx/ddb5477/Makefile.orig +1 -1
diff -Nru linux/arch/mips/ddb5xxx/ddb5477/Makefile.orig linux/arch/mips/ddb5xxx/ddb5477/Makefile
@@ -12,7 +12,7 @@
 
 obj-y	 += int-handler.o irq.o irq_5477.o setup.o pci.o pci_ops.o lcd44780.o
 
-obj-$(CONFIG_DEBUG) 		+= debug.o
+obj-$(CONFIG_RUNTIME_DEBUG) 		+= debug.o
 obj-$(CONFIG_REMOTE_DEBUG)	+= kgdb_io.o
 obj-$(CONFIG_BLK_DEV_INITRD)	+= ramdisk.o
arch/mips/ddb5xxx/ddb5477/irq.c renamed from arch/mips/ddb5xxx/ddb5477/irq.c.orig +1 -1
diff -Nru linux/arch/mips/ddb5xxx/ddb5477/irq.c.orig linux/arch/mips/ddb5xxx/ddb5477/irq.c
@@ -176,7 +176,7 @@
 	db_assert(ddb_in32(DDB_NMISTAT) == 0);
 
 	if (ddb_in32(DDB_INT1STAT) != 0) {
-#if defined(CONFIG_DEBUG)
+#if defined(CONFIG_RUNTIME_DEBUG)
 		vrc5477_show_int_regs();
 #endif
 		panic("error interrupt has happened.");
arch/mips/ddb5xxx/ddb5477/pci.c renamed from arch/mips/ddb5xxx/ddb5477/pci.c.orig +1 -1
diff -Nru linux/arch/mips/ddb5xxx/ddb5477/pci.c.orig linux/arch/mips/ddb5xxx/ddb5477/pci.c
@@ -166,7 +166,7 @@
 	}
 }
 
-#if defined(CONFIG_DEBUG)
+#if defined(CONFIG_RUNTIME_DEBUG)
 extern void jsun_scan_pci_bus(void);
 extern void jsun_assign_pci_resource(void);
 #endif
arch/mips/galileo-boards/ev64120/irq.c renamed from arch/mips/galileo-boards/ev64120/irq.c.orig +1 -1
diff -Nru linux/arch/mips/galileo-boards/ev64120/irq.c.orig linux/arch/mips/galileo-boards/ev64120/irq.c
@@ -421,7 +421,7 @@
 	set_c0_status(IE_IRQ2);
 
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	{
 		extern int DEBUG_CHANNEL;
 		serial_init(DEBUG_CHANNEL);
arch/mips/gt64120/momenco_ocelot/Makefile renamed from arch/mips/gt64120/momenco_ocelot/Makefile.orig +1 -1
diff -Nru linux/arch/mips/gt64120/momenco_ocelot/Makefile.orig linux/arch/mips/gt64120/momenco_ocelot/Makefile
@@ -12,6 +12,6 @@
 
 obj-y	 += int-handler.o irq.o pci.o prom.o reset.o setup.o
 
-obj-$(CONFIG_REMOTE_DEBUG) += dbg_io.o
+obj-$(CONFIG_KGDB) += dbg_io.o
 
 include $(TOPDIR)/Rules.make
arch/mips/gt64120/momenco_ocelot/dbg_io.c renamed from arch/mips/gt64120/momenco_ocelot/dbg_io.c.orig +1 -1
diff -Nru linux/arch/mips/gt64120/momenco_ocelot/dbg_io.c.orig linux/arch/mips/gt64120/momenco_ocelot/dbg_io.c
@@ -1,6 +1,6 @@
 #include <linux/config.h>
 
-#if defined(CONFIG_REMOTE_DEBUG)
+#if defined(CONFIG_KGDB)
 
 #include <asm/serial.h> /* For the serial port location and base baud */
arch/mips/gt64120/momenco_ocelot/irq.c renamed from arch/mips/gt64120/momenco_ocelot/irq.c.orig +1 -1
diff -Nru linux/arch/mips/gt64120/momenco_ocelot/irq.c.orig linux/arch/mips/gt64120/momenco_ocelot/irq.c
@@ -161,7 +161,7 @@
 
 	gt64120_irq_init();
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	printk("start kgdb ...\n");
 	set_debug_traps();
 	breakpoint();	/* you may move this line to whereever you want :-) */
arch/mips/hp-lj/Makefile renamed from arch/mips/hp-lj/Makefile.orig +1 -1
diff -Nru linux/arch/mips/hp-lj/Makefile.orig linux/arch/mips/hp-lj/Makefile
@@ -17,7 +17,7 @@
 
 obj-y   := init.o setup.o irq.o int-handler.o pci.o utils.o asic.o
 
-obj-$(CONFIG_REMOTE_DEBUG) += gdb_hook.o
+obj-$(CONFIG_KGDB) += gdb_hook.o
 obj-$(CONFIG_DIRECT_PRINTK) += gdb_hook.o
 
 obj-$(CONFIG_BLK_DEV_INITRD) += initrd.o
arch/mips/hp-lj/irq.c renamed from arch/mips/hp-lj/irq.c.orig +1 -1
diff -Nru linux/arch/mips/hp-lj/irq.c.orig linux/arch/mips/hp-lj/irq.c
@@ -25,7 +25,7 @@
     mips_cpu_irq_init(0);
     set_except_vector(0, hpIRQ);
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
     {
        extern void breakpoint(void);
        extern int remote_debug;
arch/mips/hp-lj/setup.c renamed from arch/mips/hp-lj/setup.c.orig +2 -2
diff -Nru linux/arch/mips/hp-lj/setup.c.orig linux/arch/mips/hp-lj/setup.c
@@ -20,7 +20,7 @@
 #include <asm/hp-lj/asic.h>
 #include "utils.h"
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 int remote_debug = 0;
 #endif
 

@@ -144,7 +144,7 @@
 
    board_timer_setup = hp_time_init;
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
    {
       extern char CommandLine[];
       remote_debug = (strstr(CommandLine, "kgdb") != NULL);
arch/mips/ite-boards/generic/Makefile renamed from arch/mips/ite-boards/generic/Makefile.orig +1 -1
diff -Nru linux/arch/mips/ite-boards/generic/Makefile.orig linux/arch/mips/ite-boards/generic/Makefile
@@ -20,6 +20,6 @@
 
 obj-$(CONFIG_PCI) += it8172_pci.o
 obj-$(CONFIG_IT8172_CIR) += it8172_cir.o
-obj-$(CONFIG_REMOTE_DEBUG) += dbg_io.o
+obj-$(CONFIG_KGDB) += dbg_io.o
 
 include $(TOPDIR)/Rules.make
arch/mips/ite-boards/generic/dbg_io.c renamed from arch/mips/ite-boards/generic/dbg_io.c.orig +1 -1
diff -Nru linux/arch/mips/ite-boards/generic/dbg_io.c.orig linux/arch/mips/ite-boards/generic/dbg_io.c
@@ -1,7 +1,7 @@
 
 #include <linux/config.h>
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 
 /* --- CONFIG --- */
arch/mips/ite-boards/generic/irq.c renamed from arch/mips/ite-boards/generic/irq.c.orig +2 -2
diff -Nru linux/arch/mips/ite-boards/generic/irq.c.orig linux/arch/mips/ite-boards/generic/irq.c
@@ -65,7 +65,7 @@
 #define DPRINTK(fmt, args...)
 #endif
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 extern void breakpoint(void);
 #endif
 

@@ -301,7 +301,7 @@
 	irq_desc[MIPS_CPU_TIMER_IRQ].handler = &cp0_irq_type;
 	set_c0_status(ALLINTS_NOTIMER);
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	/* If local serial I/O used for debug port, enter kgdb at once */
 	puts("Waiting for kgdb to connect...");
 	set_debug_traps();
arch/mips/jmr3927/rbhma3100/Makefile renamed from arch/mips/jmr3927/rbhma3100/Makefile.orig +1 -1
diff -Nru linux/arch/mips/jmr3927/rbhma3100/Makefile.orig linux/arch/mips/jmr3927/rbhma3100/Makefile
@@ -13,6 +13,6 @@
 obj-y	 += init.o int-handler.o irq.o setup.o rtc.o pci_fixup.o pci_ops.o
 
 obj-$(CONFIG_LL_DEBUG) 		+= debug.o
-obj-$(CONFIG_REMOTE_DEBUG)	+= kgdb_io.o
+obj-$(CONFIG_KGDB)	+= kgdb_io.o
 
 include $(TOPDIR)/Rules.make
arch/mips/jmr3927/rbhma3100/irq.c renamed from arch/mips/jmr3927/rbhma3100/irq.c.orig +1 -1
diff -Nru linux/arch/mips/jmr3927/rbhma3100/irq.c.orig linux/arch/mips/jmr3927/rbhma3100/irq.c
@@ -444,7 +444,7 @@
 void __init init_IRQ(void)
 {
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
         extern void breakpoint(void);
         extern void set_debug_traps(void);
arch/mips/kernel/Makefile renamed from arch/mips/kernel/Makefile.orig +1 -1
diff -Nru linux/arch/mips/kernel/Makefile.orig linux/arch/mips/kernel/Makefile
@@ -50,7 +50,7 @@
 
 obj-$(CONFIG_BINFMT_IRIX)	+= irixelf.o irixioctl.o irixsig.o sysirix.o \
 				   irixinv.o
-obj-$(CONFIG_REMOTE_DEBUG)	+= gdb-low.o gdb-stub.o
+obj-$(CONFIG_KGDB)	+= gdb-low.o gdb-stub.o
 obj-$(CONFIG_PROC_FS)		+= proc.o
 
 obj-$(CONFIG_NEW_PCI)		+= pci.o
arch/mips/kernel/gdb-stub.c renamed from arch/mips/kernel/gdb-stub.c.orig +1 -1
diff -Nru linux/arch/mips/kernel/gdb-stub.c.orig linux/arch/mips/kernel/gdb-stub.c
@@ -99,7 +99,7 @@
  *  the kernel running. It will promptly halt and wait
  *  for the host gdb session to connect. It does this
  *  since the "Kernel Hacking" option has defined
- *  CONFIG_REMOTE_DEBUG which in turn enables your calls
+ *  CONFIG_KGDB which in turn enables your calls
  *  to:
  *     set_debug_traps();
  *     breakpoint();
arch/mips/mips-boards/atlas/atlas_int.c renamed from arch/mips/mips-boards/atlas/atlas_int.c.orig +2 -2
diff -Nru linux/arch/mips/mips-boards/atlas/atlas_int.c.orig linux/arch/mips/mips-boards/atlas/atlas_int.c
@@ -130,7 +130,7 @@
 	return;
 }
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 extern void breakpoint(void);
 extern int remote_debug;
 #endif

@@ -155,7 +155,7 @@
 		irq_desc[i].handler	= &atlas_irq_type;
 	}
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	if (remote_debug) {
 		set_debug_traps();
 		breakpoint();
arch/mips/mips-boards/atlas/atlas_setup.c renamed from arch/mips/mips-boards/atlas/atlas_setup.c.orig +3 -3
diff -Nru linux/arch/mips/mips-boards/atlas/atlas_setup.c.orig linux/arch/mips/mips-boards/atlas/atlas_setup.c
@@ -38,7 +38,7 @@
 char serial_console[20];
 #endif
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 extern void rs_kgdb_hook(int);
 extern void saa9730_kgdb_hook(void);
 extern void breakpoint(void);

@@ -64,7 +64,7 @@
 
 void __init atlas_setup(void)
 {
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	int rs_putDebugChar(char);
 	char rs_getDebugChar(void);
 	int saa9730_putDebugChar(char);

@@ -90,7 +90,7 @@
 	}
 #endif
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	argptr = prom_getcmdline();
 	if ((argptr = strstr(argptr, "kgdb=ttyS")) != NULL) {
 		int line;
arch/mips/mips-boards/generic/Makefile renamed from arch/mips/mips-boards/generic/Makefile.orig +1 -1
diff -Nru linux/arch/mips/mips-boards/generic/Makefile.orig linux/arch/mips/mips-boards/generic/Makefile
@@ -32,6 +32,6 @@
 obj-$(CONFIG_MIPS_ATLAS)	+= time.o
 obj-$(CONFIG_MIPS_MALTA)	+= time.o
 obj-$(CONFIG_PCI)		+= pci.o
-obj-$(CONFIG_REMOTE_DEBUG)	+= gdb_hook.o
+obj-$(CONFIG_KGDB)	+= gdb_hook.o
 
 include $(TOPDIR)/Rules.make
arch/mips/mips-boards/malta/malta_int.c renamed from arch/mips/mips-boards/malta/malta_int.c.orig +2 -2
diff -Nru linux/arch/mips/mips-boards/malta/malta_int.c.orig linux/arch/mips/mips-boards/malta/malta_int.c
@@ -43,7 +43,7 @@
 extern void init_i8259_irqs (void);
 extern int mips_pcibios_iack(void);
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 extern void breakpoint(void);
 extern void set_debug_traps(void);
 extern int remote_debug;

@@ -142,7 +142,7 @@
 	init_generic_irq();
 	init_i8259_irqs();
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	if (remote_debug) {
 		set_debug_traps();
 		breakpoint();
arch/mips/mips-boards/malta/malta_setup.c renamed from arch/mips/mips-boards/malta/malta_setup.c.orig +3 -3
diff -Nru linux/arch/mips/mips-boards/malta/malta_setup.c.orig linux/arch/mips/mips-boards/malta/malta_setup.c
@@ -50,7 +50,7 @@
 char serial_console[20];
 #endif
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 extern void rs_kgdb_hook(int);
 int remote_debug = 0;
 #endif

@@ -86,7 +86,7 @@
 
 void __init malta_setup(void)
 {
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	int rs_putDebugChar(char);
 	char rs_getDebugChar(void);
 	extern int (*generic_putDebugChar)(char);

@@ -112,7 +112,7 @@
 	}
 #endif
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	argptr = prom_getcmdline();
 	if ((argptr = strstr(argptr, "kgdb=ttyS")) != NULL) {
 		int line;
arch/mips/momentum/ocelot_g/Makefile renamed from arch/mips/momentum/ocelot_g/Makefile.orig +1 -1
diff -Nru linux/arch/mips/momentum/ocelot_g/Makefile.orig linux/arch/mips/momentum/ocelot_g/Makefile
@@ -12,6 +12,6 @@
 
 obj-y	 += gt-irq.o pci-irq.o pci.o int-handler.o irq.o prom.o reset.o setup.o
 
-obj-$(CONFIG_REMOTE_DEBUG) += dbg_io.o
+obj-$(CONFIG_KGDB) += dbg_io.o
 
 include $(TOPDIR)/Rules.make
arch/mips/momentum/ocelot_g/dbg_io.c renamed from arch/mips/momentum/ocelot_g/dbg_io.c.orig +1 -1
diff -Nru linux/arch/mips/momentum/ocelot_g/dbg_io.c.orig linux/arch/mips/momentum/ocelot_g/dbg_io.c
@@ -1,6 +1,6 @@
 #include <linux/config.h>
 
-#if defined(CONFIG_REMOTE_DEBUG)
+#if defined(CONFIG_KGDB)
 
 #include <asm/serial.h> /* For the serial port location and base baud */
arch/mips/momentum/ocelot_g/irq.c renamed from arch/mips/momentum/ocelot_g/irq.c.orig +1 -1
diff -Nru linux/arch/mips/momentum/ocelot_g/irq.c.orig linux/arch/mips/momentum/ocelot_g/irq.c
@@ -161,7 +161,7 @@
 
 	gt64240_irq_init();
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	printk("start kgdb ...\n");
 	set_debug_traps();
 	breakpoint();	/* you may move this line to whereever you want :-) */
arch/mips/momentum/ocelot_c/Makefile renamed from arch/mips/momentum/ocelot_c/Makefile.orig +1 -1
diff -Nru linux/arch/mips/momentum/ocelot_c/Makefile.orig linux/arch/mips/momentum/ocelot_c/Makefile
@@ -13,6 +13,6 @@
 obj-y	 += mv-irq.o cpci-irq.o uart-irq.o int-handler.o irq.o
 obj-y    += pci-irq.o pci.o prom.o reset.o setup.o 
 
-obj-$(CONFIG_REMOTE_DEBUG) += dbg_io.o
+obj-$(CONFIG_KGDB) += dbg_io.o
 
 include $(TOPDIR)/Rules.make
arch/mips/momentum/ocelot_c/dbg_io.c renamed from arch/mips/momentum/ocelot_c/dbg_io.c.orig +1 -1
diff -Nru linux/arch/mips/momentum/ocelot_c/dbg_io.c.orig linux/arch/mips/momentum/ocelot_c/dbg_io.c
@@ -1,6 +1,6 @@
 #include <linux/config.h>
 
-#if defined(CONFIG_REMOTE_DEBUG)
+#if defined(CONFIG_KGDB)
 
 #include <asm/serial.h> /* For the serial port location and base baud */
arch/mips/momentum/ocelot_c/irq.c renamed from arch/mips/momentum/ocelot_c/irq.c.orig +1 -1
diff -Nru linux/arch/mips/momentum/ocelot_c/irq.c.orig linux/arch/mips/momentum/ocelot_c/irq.c
@@ -171,7 +171,7 @@
 	uart_irq_init();
 	cpci_irq_init();
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	printk("start kgdb ...\n");
 	set_debug_traps();
 	breakpoint();	/* you may move this line to whereever you want :-) */
arch/mips/philips/nino/irq.c renamed from arch/mips/philips/nino/irq.c.orig +1 -1
diff -Nru linux/arch/mips/philips/nino/irq.c.orig linux/arch/mips/philips/nino/irq.c
@@ -251,7 +251,7 @@
 
 void __init init_IRQ(void)
 {
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	extern void breakpoint(void);
 	extern void set_debug_traps(void);
arch/mips/sgi-ip22/ip22-setup.c renamed from arch/mips/sgi-ip22/ip22-setup.c.orig +3 -3
diff -Nru linux/arch/mips/sgi-ip22/ip22-setup.c.orig linux/arch/mips/sgi-ip22/ip22-setup.c
@@ -31,7 +31,7 @@
 #include <asm/io.h>
 #include <asm/traps.h>
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 extern void rs_kgdb_hook(int);
 extern void breakpoint(void);
 static int remote_debug = 0;

@@ -129,7 +129,7 @@
 void __init ip22_setup(void)
 {
 	char *ctype;
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	char *kgdb_ttyd;
 #endif
 	sgitime_init();

@@ -173,7 +173,7 @@
 	}
 #endif
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	kgdb_ttyd = prom_getcmdline();
 	if ((kgdb_ttyd = strstr(kgdb_ttyd, "kgdb=ttyd")) != NULL) {
 		int line;
arch/mips/sibyte/sb1250/irq.c renamed from arch/mips/sibyte/sb1250/irq.c.orig +5 -5
diff -Nru linux/arch/mips/sibyte/sb1250/irq.c.orig linux/arch/mips/sibyte/sb1250/irq.c
@@ -58,7 +58,7 @@
 extern unsigned long ldt_eoi_space;
 #endif
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 extern void breakpoint(void);
 extern void set_debug_traps(void);
 

@@ -368,14 +368,14 @@
 #ifdef CONFIG_BCM1250_PROF
 	imask |= STATUSF_IP7;
 #endif
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	imask |= STATUSF_IP6;
 #endif
 	/* Enable necessary IPs, disable the rest */
 	change_c0_status(ST0_IM, imask);
 	set_except_vector(0, sb1250_irq_handler);
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	if (kgdb_flag) {
 		/* Setup uart 1 settings, mapper */
 		out64(M_DUART_IMR_BRK, KSEG1 + A_DUART + R_DUART_IMR_B);

@@ -392,7 +392,7 @@
 #endif
 }
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 
 #include <linux/delay.h>
 

@@ -414,4 +414,4 @@
 	if (!user_mode(regs))
 		set_async_breakpoint(regs->cp0_epc);
 }
-#endif 	/* CONFIG_REMOTE_DEBUG */
+#endif 	/* CONFIG_KGDB */
arch/mips/sibyte/sb1250/irq_handler.S renamed from arch/mips/sibyte/sb1250/irq_handler.S.orig +1 -1
diff -Nru linux/arch/mips/sibyte/sb1250/irq_handler.S.orig linux/arch/mips/sibyte/sb1250/irq_handler.S
@@ -108,7 +108,7 @@
 2:
 #endif
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	/* KGDB (uart 1) interrupt is routed to IP[6] */
 	andi	t1, s0, CAUSEF_IP6
 	beqz	t1, 1f
arch/mips/sibyte/swarm/Makefile renamed from arch/mips/sibyte/swarm/Makefile.orig +1 -1
diff -Nru linux/arch/mips/sibyte/swarm/Makefile.orig linux/arch/mips/sibyte/swarm/Makefile
@@ -4,7 +4,7 @@
 
 OBJS-y                   = setup.o cmdline.o rtc_xicor1241.o rtc_m41t81.o
 
-OBJS-$(CONFIG_REMOTE_DEBUG) += dbg_io.o
+OBJS-$(CONFIG_KGDB) += dbg_io.o
 
 sbswarm.a: $(OBJS-y)
 	$(AR) rcs sbswarm.a $^
arch/mips/vr4181/common/irq.c renamed from arch/mips/vr4181/common/irq.c.orig +1 -1
diff -Nru linux/arch/mips/vr4181/common/irq.c.orig linux/arch/mips/vr4181/common/irq.c
@@ -239,7 +239,7 @@
 	setup_irq(VR4181_IRQ_RTCL1, &reserved);
 	setup_irq(VR4181_IRQ_RTCL2, &reserved);
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	printk("Setting debug traps - please connect the remote debugger.\n");
 
 	set_debug_traps();
arch/mips/vr4181/osprey/Makefile renamed from arch/mips/vr4181/osprey/Makefile.orig +1 -1
diff -Nru linux/arch/mips/vr4181/osprey/Makefile.orig linux/arch/mips/vr4181/osprey/Makefile
@@ -12,6 +12,6 @@
 
 obj-y	 := setup.o prom.o reset.o
 
-obj-$(CONFIG_REMOTE_DEBUG)	+= dbg_io.o
+obj-$(CONFIG_KGDB)	+= dbg_io.o
 
 include $(TOPDIR)/Rules.make
arch/mips/vr41xx/common/icu.c renamed from arch/mips/vr41xx/common/icu.c.orig +1 -1
diff -Nru linux/arch/mips/vr41xx/common/icu.c.orig linux/arch/mips/vr41xx/common/icu.c
@@ -339,7 +339,7 @@
 
 	set_except_vector(0, vr41xx_handle_interrupt);
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	printk("Setting debug traps - please connect the remote debugger.\n");
 	set_debug_traps();
 	breakpoint();
arch/mips/Makefile renamed from arch/mips/Makefile.orig +1 -1
diff -Nru linux/arch/mips/Makefile.orig linux/arch/mips/Makefile
@@ -41,7 +41,7 @@
 LINKFLAGS	+= -G 0 -static # -N
 MODFLAGS	+= -mlong-calls
 
-ifdef CONFIG_REMOTE_DEBUG
+ifdef CONFIG_KGDB
 GCCFLAGS	+= -g
 ifdef CONFIG_SB1XXX_CORELIS
 GCCFLAGS	+= -mno-sched-prolog -fno-omit-frame-pointer
arch/mips/config-shared.in renamed from arch/mips/config-shared.in.orig +2 -2
diff -Nru linux/arch/mips/config-shared.in.orig linux/arch/mips/config-shared.in
@@ -975,11 +975,11 @@
 comment 'Kernel hacking'
 
 bool 'Are you using a crosscompiler' CONFIG_CROSSCOMPILE
-bool 'Enable run-time debugging' CONFIG_DEBUG
+bool 'Enable run-time debugging' CONFIG_RUNTIME_DEBUG
 bool 'Remote GDB kernel debugging' CONFIG_REMOTE_DEBUG
 dep_bool '  Console output to GDB' CONFIG_GDB_CONSOLE $CONFIG_REMOTE_DEBUG
 if [ "$CONFIG_SIBYTE_SB1xxx_SOC" = "y" ]; then
-   dep_bool 'Compile for Corelis Debugger' CONFIG_SB1XXX_CORELIS $CONFIG_DEBUG
+   dep_bool 'Compile for Corelis Debugger' CONFIG_SB1XXX_CORELIS $CONFIG_RUNTIME_DEBUG
 fi
 bool 'Magic SysRq key' CONFIG_MAGIC_SYSRQ
 if [ "$CONFIG_SMP" != "y" ]; then
arch/mips/defconfig-decstation renamed from arch/mips/defconfig-decstation.orig +1 -1
diff -Nru linux/arch/mips/defconfig-decstation.orig linux/arch/mips/defconfig-decstation
@@ -598,7 +598,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_REMOTE_DEBUG is not set
 # CONFIG_GDB_CONSOLE is not set
 # CONFIG_MAGIC_SYSRQ is not set
arch/mips/defconfig-pb1000 renamed from arch/mips/defconfig-pb1000.orig +1 -1
diff -Nru linux/arch/mips/defconfig-pb1000.orig linux/arch/mips/defconfig-pb1000
@@ -810,7 +810,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_REMOTE_DEBUG is not set
 # CONFIG_GDB_CONSOLE is not set
 # CONFIG_MAGIC_SYSRQ is not set
arch/mips/defconfig-pb1100 renamed from arch/mips/defconfig-pb1100.orig +1 -1
diff -Nru linux/arch/mips/defconfig-pb1100.orig linux/arch/mips/defconfig-pb1100
@@ -834,7 +834,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_REMOTE_DEBUG is not set
 # CONFIG_GDB_CONSOLE is not set
 # CONFIG_MAGIC_SYSRQ is not set
arch/mips/defconfig-pb1500 renamed from arch/mips/defconfig-pb1500.orig +1 -1
diff -Nru linux/arch/mips/defconfig-pb1500.orig linux/arch/mips/defconfig-pb1500
@@ -1019,7 +1019,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_REMOTE_DEBUG is not set
 # CONFIG_GDB_CONSOLE is not set
 # CONFIG_MAGIC_SYSRQ is not set
arch/mips/defconfig-sb1250-swarm renamed from arch/mips/defconfig-sb1250-swarm.orig +1 -1
diff -Nru linux/arch/mips/defconfig-sb1250-swarm.orig linux/arch/mips/defconfig-sb1250-swarm
@@ -551,7 +551,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_REMOTE_DEBUG is not set
 # CONFIG_GDB_CONSOLE is not set
 # CONFIG_SB1XXX_CORELIS is not set
arch/mips/defconfig-db1000 renamed from arch/mips/defconfig-db1000.orig +1 -1
diff -Nru linux/arch/mips/defconfig-db1000.orig linux/arch/mips/defconfig-db1000
@@ -755,7 +755,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_REMOTE_DEBUG is not set
 # CONFIG_GDB_CONSOLE is not set
 # CONFIG_MAGIC_SYSRQ is not set
arch/mips/defconfig-db1500 renamed from arch/mips/defconfig-db1500.orig +1 -1
diff -Nru linux/arch/mips/defconfig-db1500.orig linux/arch/mips/defconfig-db1500
@@ -763,7 +763,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_REMOTE_DEBUG is not set
 # CONFIG_GDB_CONSOLE is not set
 # CONFIG_MAGIC_SYSRQ is not set
arch/mips/defconfig renamed from arch/mips/defconfig.orig +1 -1
diff -Nru linux/arch/mips/defconfig.orig linux/arch/mips/defconfig
@@ -641,7 +641,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MIPS_UNCACHED is not set
arch/mips/defconfig-atlas renamed from arch/mips/defconfig-atlas.orig +1 -1
diff -Nru linux/arch/mips/defconfig-atlas.orig linux/arch/mips/defconfig-atlas
@@ -640,7 +640,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MIPS_UNCACHED is not set
arch/mips/defconfig-capcella renamed from arch/mips/defconfig-capcella.orig +1 -1
diff -Nru linux/arch/mips/defconfig-capcella.orig linux/arch/mips/defconfig-capcella
@@ -641,7 +641,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MIPS_UNCACHED is not set
arch/mips/defconfig-cobalt renamed from arch/mips/defconfig-cobalt.orig +1 -1
diff -Nru linux/arch/mips/defconfig-cobalt.orig linux/arch/mips/defconfig-cobalt
@@ -636,7 +636,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MIPS_UNCACHED is not set
arch/mips/defconfig-ddb5476 renamed from arch/mips/defconfig-ddb5476.orig +1 -1
diff -Nru linux/arch/mips/defconfig-ddb5476.orig linux/arch/mips/defconfig-ddb5476
@@ -677,7 +677,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-CONFIG_DEBUG=y
+CONFIG_RUNTIME_DEBUG=y
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MIPS_UNCACHED is not set
arch/mips/defconfig-ddb5477 renamed from arch/mips/defconfig-ddb5477.orig +1 -1
diff -Nru linux/arch/mips/defconfig-ddb5477.orig linux/arch/mips/defconfig-ddb5477
@@ -573,7 +573,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-CONFIG_DEBUG=y
+CONFIG_RUNTIME_DEBUG=y
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MIPS_UNCACHED is not set
arch/mips/defconfig-e55 renamed from arch/mips/defconfig-e55.orig +1 -1
diff -Nru linux/arch/mips/defconfig-e55.orig linux/arch/mips/defconfig-e55
@@ -601,7 +601,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MIPS_UNCACHED is not set
arch/mips/defconfig-eagle renamed from arch/mips/defconfig-eagle.orig +1 -1
diff -Nru linux/arch/mips/defconfig-eagle.orig linux/arch/mips/defconfig-eagle
@@ -776,7 +776,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MIPS_UNCACHED is not set
arch/mips/defconfig-ev64120 renamed from arch/mips/defconfig-ev64120.orig +1 -1
diff -Nru linux/arch/mips/defconfig-ev64120.orig linux/arch/mips/defconfig-ev64120
@@ -558,7 +558,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MIPS_UNCACHED is not set
arch/mips/defconfig-ev96100 renamed from arch/mips/defconfig-ev96100.orig +1 -1
diff -Nru linux/arch/mips/defconfig-ev96100.orig linux/arch/mips/defconfig-ev96100
@@ -553,7 +553,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MIPS_UNCACHED is not set
arch/mips/defconfig-hp-lj renamed from arch/mips/defconfig-hp-lj.orig +1 -1
diff -Nru linux/arch/mips/defconfig-hp-lj.orig linux/arch/mips/defconfig-hp-lj
@@ -708,7 +708,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MIPS_UNCACHED is not set
arch/mips/defconfig-ip22 renamed from arch/mips/defconfig-ip22.orig +1 -1
diff -Nru linux/arch/mips/defconfig-ip22.orig linux/arch/mips/defconfig-ip22
@@ -641,7 +641,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MIPS_UNCACHED is not set
arch/mips/defconfig-it8172 renamed from arch/mips/defconfig-it8172.orig +1 -1
diff -Nru linux/arch/mips/defconfig-it8172.orig linux/arch/mips/defconfig-it8172
@@ -729,7 +729,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MIPS_UNCACHED is not set
arch/mips/defconfig-ivr renamed from arch/mips/defconfig-ivr.orig +1 -1
diff -Nru linux/arch/mips/defconfig-ivr.orig linux/arch/mips/defconfig-ivr
@@ -765,7 +765,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MIPS_UNCACHED is not set
arch/mips/defconfig-jmr3927 renamed from arch/mips/defconfig-jmr3927.orig +1 -1
diff -Nru linux/arch/mips/defconfig-jmr3927.orig linux/arch/mips/defconfig-jmr3927
@@ -618,7 +618,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MIPS_UNCACHED is not set
arch/mips/defconfig-lasat renamed from arch/mips/defconfig-lasat.orig +1 -1
diff -Nru linux/arch/mips/defconfig-lasat.orig linux/arch/mips/defconfig-lasat
@@ -705,7 +705,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_MIPS_UNCACHED is not set
arch/mips/defconfig-malta renamed from arch/mips/defconfig-malta.orig +1 -1
diff -Nru linux/arch/mips/defconfig-malta.orig linux/arch/mips/defconfig-malta
@@ -621,7 +621,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MIPS_UNCACHED is not set
arch/mips/defconfig-mpc30x renamed from arch/mips/defconfig-mpc30x.orig +1 -1
diff -Nru linux/arch/mips/defconfig-mpc30x.orig linux/arch/mips/defconfig-mpc30x
@@ -648,7 +648,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MIPS_UNCACHED is not set
arch/mips/defconfig-nino renamed from arch/mips/defconfig-nino.orig +1 -1
diff -Nru linux/arch/mips/defconfig-nino.orig linux/arch/mips/defconfig-nino
@@ -498,7 +498,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MIPS_UNCACHED is not set
arch/mips/defconfig-ocelot renamed from arch/mips/defconfig-ocelot.orig +1 -1
diff -Nru linux/arch/mips/defconfig-ocelot.orig linux/arch/mips/defconfig-ocelot
@@ -547,7 +547,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MIPS_UNCACHED is not set
arch/mips/defconfig-osprey renamed from arch/mips/defconfig-osprey.orig +1 -1
diff -Nru linux/arch/mips/defconfig-osprey.orig linux/arch/mips/defconfig-osprey
@@ -520,7 +520,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MIPS_UNCACHED is not set
arch/mips/defconfig-rm200 renamed from arch/mips/defconfig-rm200.orig +1 -1
diff -Nru linux/arch/mips/defconfig-rm200.orig linux/arch/mips/defconfig-rm200
@@ -481,7 +481,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MIPS_UNCACHED is not set
arch/mips/defconfig-sead renamed from arch/mips/defconfig-sead.orig +1 -1
diff -Nru linux/arch/mips/defconfig-sead.orig linux/arch/mips/defconfig-sead
@@ -359,7 +359,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MIPS_UNCACHED is not set
arch/mips/defconfig-tb0226 renamed from arch/mips/defconfig-tb0226.orig +1 -1
diff -Nru linux/arch/mips/defconfig-tb0226.orig linux/arch/mips/defconfig-tb0226
@@ -764,7 +764,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MIPS_UNCACHED is not set
arch/mips/defconfig-workpad renamed from arch/mips/defconfig-workpad.orig +1 -1
diff -Nru linux/arch/mips/defconfig-workpad.orig linux/arch/mips/defconfig-workpad
@@ -601,7 +601,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MIPS_UNCACHED is not set
arch/mips64/Makefile renamed from arch/mips64/Makefile.orig +1 -1
diff -Nru linux/arch/mips64/Makefile.orig linux/arch/mips64/Makefile
@@ -39,7 +39,7 @@
 LINKFLAGS	+= -G 0 -static # -N
 MODFLAGS	+= -mlong-calls
 
-ifdef CONFIG_REMOTE_DEBUG
+ifdef CONFIG_KGDB
 GCCFLAGS	+= -g
 ifdef CONFIG_SB1XXX_CORELIS
 GCCFLAGS	+= -mno-sched-prolog -fno-omit-frame-pointer
arch/mips64/defconfig-malta renamed from arch/mips64/defconfig-malta.orig +1 -1
diff -Nru linux/arch/mips64/defconfig-malta.orig linux/arch/mips64/defconfig-malta
@@ -587,7 +587,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_REMOTE_DEBUG is not set
 # CONFIG_GDB_CONSOLE is not set
 # CONFIG_MAGIC_SYSRQ is not set
arch/mips64/defconfig-sb1250-swarm renamed from arch/mips64/defconfig-sb1250-swarm.orig +1 -1
diff -Nru linux/arch/mips64/defconfig-sb1250-swarm.orig linux/arch/mips64/defconfig-sb1250-swarm
@@ -551,7 +551,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_REMOTE_DEBUG is not set
 # CONFIG_GDB_CONSOLE is not set
 # CONFIG_SB1XXX_CORELIS is not set
arch/mips64/defconfig-decstation renamed from arch/mips64/defconfig-decstation.orig +1 -1
diff -Nru linux/arch/mips64/defconfig-decstation.orig linux/arch/mips64/defconfig-decstation
@@ -596,7 +596,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_REMOTE_DEBUG is not set
 # CONFIG_GDB_CONSOLE is not set
 # CONFIG_MAGIC_SYSRQ is not set
arch/mips64/defconfig renamed from arch/mips64/defconfig.orig +1 -1
diff -Nru linux/arch/mips64/defconfig.orig linux/arch/mips64/defconfig
@@ -590,7 +590,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
 
 #
arch/mips64/defconfig-atlas renamed from arch/mips64/defconfig-atlas.orig +1 -1
diff -Nru linux/arch/mips64/defconfig-atlas.orig linux/arch/mips64/defconfig-atlas
@@ -584,7 +584,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MIPS_UNCACHED is not set
arch/mips64/defconfig-ip22 renamed from arch/mips64/defconfig-ip22.orig +1 -1
diff -Nru linux/arch/mips64/defconfig-ip22.orig linux/arch/mips64/defconfig-ip22
@@ -637,7 +637,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MIPS_UNCACHED is not set
arch/mips64/defconfig-ip27 renamed from arch/mips64/defconfig-ip27.orig +1 -1
diff -Nru linux/arch/mips64/defconfig-ip27.orig linux/arch/mips64/defconfig-ip27
@@ -590,7 +590,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
 
 #
arch/mips64/defconfig-ip32 renamed from arch/mips64/defconfig-ip32.orig +1 -1
diff -Nru linux/arch/mips64/defconfig-ip32.orig linux/arch/mips64/defconfig-ip32
@@ -609,7 +609,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MIPS_UNCACHED=y
arch/mips64/defconfig-sead renamed from arch/mips64/defconfig-sead.orig +1 -1
diff -Nru linux/arch/mips64/defconfig-sead.orig linux/arch/mips64/defconfig-sead
@@ -357,7 +357,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_DEBUG is not set
+# CONFIG_RUNTIME_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MIPS_UNCACHED is not set
drivers/char/Config.in renamed from drivers/char/Config.in.orig +1 -1
diff -Nru linux/drivers/char/Config.in.orig linux/drivers/char/Config.in
@@ -99,7 +99,7 @@
             if [ "$CONFIG_SIBYTE_SB1250_DUART_CONSOLE" = "y" ]; then
                define_bool CONFIG_SERIAL_CONSOLE y
             fi
-            if [ "$CONFIG_REMOTE_DEBUG" = "y" ]; then
+            if [ "$CONFIG_KGDB" = "y" ]; then
                define_bool CONFIG_SIBYTE_SB1250_DUART_NO_PORT_1 y
             fi
          fi
drivers/sgi/char/sgiserial.c renamed from drivers/sgi/char/sgiserial.c.orig +3 -3
diff -Nru linux/drivers/sgi/char/sgiserial.c.orig linux/drivers/sgi/char/sgiserial.c
@@ -18,7 +18,7 @@
  *                                             any speed - not only 9600
  */
 
-#include <linux/config.h> /* for CONFIG_REMOTE_DEBUG */
+#include <linux/config.h> /* for CONFIG_KGDB */
 #include <linux/errno.h>
 #include <linux/signal.h>
 #include <linux/sched.h>

@@ -395,7 +395,7 @@
 	mark_bh(SERIAL_BH);
 }
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 extern void set_async_breakpoint(unsigned int epc);
 #endif
 

@@ -431,7 +431,7 @@
 	 * for remote target debugging and arch/sparc/kernel/sparc-stub.c
 	 * to see how all this works.
 	 */
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	if((info->kgdb_channel) && (ch =='\003')) {
 		set_async_breakpoint(read_32bit_cp0_register(CP0_EPC));
 		goto clear_and_exit;
drivers/sound/Config.in renamed from drivers/sound/Config.in.orig +1 -1
diff -Nru linux/drivers/sound/Config.in.orig linux/drivers/sound/Config.in
@@ -35,7 +35,7 @@
 dep_mbool    '    Creative SBLive! MIDI' CONFIG_MIDI_EMU10K1 $CONFIG_SOUND_EMU10K1 $CONFIG_EXPERIMENTAL
 dep_tristate '  Crystal SoundFusion (CS4280/461x)' CONFIG_SOUND_FUSION $CONFIG_SOUND $CONFIG_PCI
 dep_tristate '  Crystal Sound CS4281' CONFIG_SOUND_CS4281 $CONFIG_SOUND $CONFIG_PCI
-if [ "$CONFIG_SIBYTE_SB1250" = "y" -a "$CONFIG_REMOTE_DEBUG" != "y" ]; then
+if [ "$CONFIG_SIBYTE_SB1250" = "y" -a "$CONFIG_KGDB" != "y" ]; then
     dep_tristate '  Crystal Sound CS4297a (for Swarm)' CONFIG_SOUND_BCM_CS4297A $CONFIG_SOUND
 fi
 dep_tristate '  Ensoniq AudioPCI (ES1370)' CONFIG_SOUND_ES1370 $CONFIG_SOUND $CONFIG_PCI
drivers/sound/trident.c renamed from drivers/sound/trident.c.orig +1 -1
diff -Nru linux/drivers/sound/trident.c.orig linux/drivers/sound/trident.c
@@ -66,7 +66,7 @@
  *      with nothing in between. 
  *  v0.14.10a
  *      June 21 2002 Muli Ben-Yehuda <[email protected]> 
- *      use a debug macro instead of #ifdef CONFIG_DEBUG, trim to 80 columns 
+ *      use a debug macro instead of #ifdef CONFIG_RUNTIME_DEBUG, trim to 80 columns 
  *      per line, use 'do {} while (0)' in statement macros. 
  *  v0.14.10
  *      June 6 2002 Lei Hu <[email protected]>
include/asm-mips/ddb5xxx/ddb5477.h renamed from include/asm-mips/ddb5xxx/ddb5477.h.orig +1 -1
diff -Nru linux/include/asm-mips/ddb5xxx/ddb5477.h.orig linux/include/asm-mips/ddb5xxx/ddb5477.h
@@ -329,7 +329,7 @@
  * debug routines
  */
 #ifndef __ASSEMBLY__
-#if defined(CONFIG_DEBUG)
+#if defined(CONFIG_RUNTIME_DEBUG)
 extern void vrc5477_show_pdar_regs(void);
 extern void vrc5477_show_pci_regs(void);
 extern void vrc5477_show_bar_regs(void);
include/asm-mips/debug.h renamed from include/asm-mips/debug.h.orig +3 -3
diff -Nru linux/include/asm-mips/debug.h.orig linux/include/asm-mips/debug.h
@@ -1,5 +1,5 @@
 /*
- * Debug macros for run-time debugging.  Turned on/off with CONFIG_DEBUG option.
+ * Debug macros for run-time debugging.  Turned on/off with CONFIG_RUNTIME_DEBUG option.
  *
  * Copyright (C) 2001 MontaVista Software Inc.
  * Author: Jun Sun, [email protected] or [email protected]

@@ -17,13 +17,13 @@
 #include <linux/config.h>
 
 /*
- * run-time macros for catching spurious errors.  Eable CONFIG_DEBUG in
+ * run-time macros for catching spurious errors.  Eable CONFIG_RUNTIME_DEBUG in
  * kernel hacking config menu to use them.
  *
  * Use them as run-time debugging aid.  NEVER USE THEM AS ERROR HANDLING CODE!!!
  */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_RUNTIME_DEBUG
 
 #include <linux/kernel.h>
#1 lore raw

PATCH 1/1 add CONFIG_DEBUG_INFO

Quoted 6 lines · Jun Sun

This patch make the following changes

1) CONFIG_REMOTE_DEBUG -> CONFIG_KGDB
2) CONFIG_DEBUG -> CONFIG_RUNTIME_DEBUG

Quoted 6 lines

MIPS is pretty much the only one (other than the pitiful s390 :0) using REMOTE_DEBUG instead of KGDB. So it is a good thing to change it.

As Keith pointed out, CONFIG_DEBUG is too general (which has already caused confusion, BTW). RUNTIME_DEBUG is more appropriate.

I'd like to propose a further change here, which is to decouple the inclusion of debugging symbols from building with KGDB support. I use a JTAG debugger all the time, and don't need/want KGDB built in (by default it forces the remote GDB to attach and continue, and it steals one of the serial ports on my platform).

How about adding "CONFIG_DEBUG_INFO" which simply adds '-g' to the CFLAGS? REMOTE_KGDB can be left independent of this option by allowing either option to enable '-g'. Patch for 2.4 attached.

Comments?

Kip

Index: arch/mips/config-shared.in
===================================================================
RCS file: /home/cvs/linux/arch/mips/Attic/config-shared.in,v retrieving revision 1.1.2.48

mips/config-shared.in +1 -0
diff -u -r1.1.2.48 config-shared.in
@@ -976,6 +976,7 @@
 
 bool 'Are you using a crosscompiler' CONFIG_CROSSCOMPILE
 bool 'Enable run-time debugging' CONFIG_RUNTIME_DEBUG
+bool 'Debugging symbols' CONFIG_DEBUG_INFO
 bool 'Remote GDB kernel debugging' CONFIG_KGDB
 dep_bool '  Console output to GDB' CONFIG_GDB_CONSOLE $CONFIG_KGDB
 if [ "$CONFIG_SIBYTE_SB1xxx_SOC" = "y" ]; then

Index: arch/mips/Makefile
===================================================================
RCS file: /home/cvs/linux/arch/mips/Makefile,v
retrieving revision 1.78.2.23

mips/Makefile +2 -2
diff -u -r1.78.2.23 Makefile
@@ -41,8 +41,8 @@
 LINKFLAGS	+= -G 0 -static # -N
 MODFLAGS	+= -mlong-calls
 
-ifdef CONFIG_KGDB
-GCCFLAGS	+= -g
+ifneq ($(CONFIG_DEBUG_INFO)$(CONFIG_KGDB),)
+GCCFLAGS	+= -gstabs+
 ifdef CONFIG_SB1XXX_CORELIS
 GCCFLAGS	+= -mno-sched-prolog -fno-omit-frame-pointer
 endif

Index: arch/mips64/Makefile
===================================================================
RCS file: /home/cvs/linux/arch/mips64/Makefile,v
retrieving revision 1.22.2.27

mips64/Makefile +1 -1
diff -u -r1.22.2.27 Makefile
@@ -39,7 +39,7 @@
 LINKFLAGS	+= -G 0 -static # -N
 MODFLAGS	+= -mlong-calls
 
-ifdef CONFIG_KGDB
+ifneq ($(CONFIG_DEBUG_INFO)$(CONFIG_KGDB),)
 GCCFLAGS	+= -g
 ifdef CONFIG_SB1XXX_CORELIS
 GCCFLAGS	+= -mno-sched-prolog -fno-omit-frame-pointer
#2 lore raw

Re: [PATCH] add CONFIG_DEBUG_INFO

Quoted 4 lines · Kip Walker

How about adding "CONFIG_DEBUG_INFO" which simply adds '-g' to the CFLAGS? REMOTE_KGDB can be left independent of this option by allowing either option to enable '-g'. Patch for 2.4 attached.

My, just noticed that this patch included my local hack of using '-gstabs+' instead of '-g' in the 32-bit Makefile, because my GDB doesn't like DWARF2 so much yet. I wasn't intending to advocate this change.

Kip

#3 lore raw

Re: [PATCH] add CONFIG_DEBUG_INFO

In reply to Kip Walker
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"kip" == Kip Walker <[email protected]> writes:

Hi

kip> KipIndex: arch/mips/config-shared.in
kip> =================================================================== kip> RCS file: /home/cvs/linux/arch/mips/Attic/config-shared.in,v kip> retrieving revision 1.1.2.48
kip> diff -u -r1.1.2.48 config-shared.in
kip> --- arch/mips/config-shared.in 26 Feb 2003 21:14:23 -0000 1.1.2.48
kip> +++ arch/mips/config-shared.in 3 Mar 2003 19:41:11 -0000
kip> @@ -976,6 +976,7 @@

kip> bool 'Are you using a crosscompiler' CONFIG_CROSSCOMPILE kip> bool 'Enable run-time debugging' CONFIG_RUNTIME_DEBUG kip> +bool 'Debugging symbols' CONFIG_DEBUG_INFO
kip> bool 'Remote GDB kernel debugging' CONFIG_KGDB
kip> dep_bool ' Console output to GDB' CONFIG_GDB_CONSOLE $CONFIG_KGDB kip> if [ "$CONFIG_SIBYTE_SB1xxx_SOC" = "y" ]; then

Once there, doing something like:

bool 'Remote GDB kernel debugging' CONFIG_KGDB
if [ "$CONFIG_KGDB" = "y" ]; then
define_bool CONFIG_DEBUG_INFO n
else
bool 'Debugging symbols' CONFIG_DEBUG_INFO
fi

And you can use single ifdefs in Makefiles?

Later, Juan.

Signature · 2 lines
In theory, practice and theory are the same, but in practice they 
are different -- Larry McVoy
#4 lore raw

Re: [PATCH] add CONFIG_DEBUG_INFO

Any more comments on this topic? Here's a patch that incorporates Juan's suggestion. I'm content to do away with the multiple-dependence syntax in the Makefiles... having KGDB on defines "CONFIG_DEBUG_INFO", otherwise you can explicitly turn it on. If no one objects, I'll do the same for 2.5.

Kip

Index: arch/mips/config-shared.in
===================================================================
RCS file: /home/cvs/linux/arch/mips/Attic/config-shared.in,v retrieving revision 1.1.2.48

mips/config-shared.in +5 -0
diff -u -r1.1.2.48 config-shared.in
@@ -977,6 +977,11 @@
 bool 'Are you using a crosscompiler' CONFIG_CROSSCOMPILE
 bool 'Enable run-time debugging' CONFIG_RUNTIME_DEBUG
 bool 'Remote GDB kernel debugging' CONFIG_KGDB
+if [ "$CONFIG_KGDB" = "y" ]; then
+   define_bool CONFIG_DEBUG_INFO y
+else
+   bool 'Debugging symbols' CONFIG_DEBUG_INFO
+fi
 dep_bool '  Console output to GDB' CONFIG_GDB_CONSOLE $CONFIG_KGDB
 if [ "$CONFIG_SIBYTE_SB1xxx_SOC" = "y" ]; then
    bool 'Compile for Corelis Debugger' CONFIG_SB1XXX_CORELIS

Index: arch/mips/Makefile
===================================================================
RCS file: /home/cvs/linux/arch/mips/Makefile,v
retrieving revision 1.78.2.23

mips/Makefile +2 -2
diff -u -r1.78.2.23 Makefile
@@ -41,11 +41,11 @@
 LINKFLAGS	+= -G 0 -static # -N
 MODFLAGS	+= -mlong-calls
 
-ifdef CONFIG_KGDB
+ifdef CONFIG_DEBUG_INFO
 GCCFLAGS	+= -g
+endif
 ifdef CONFIG_SB1XXX_CORELIS
 GCCFLAGS	+= -mno-sched-prolog -fno-omit-frame-pointer
-endif
 endif
 
 check_gcc = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi)

Index: arch/mips64/Makefile
===================================================================
RCS file: /home/cvs/linux/arch/mips64/Makefile,v
retrieving revision 1.22.2.27

mips64/Makefile +2 -2
diff -u -r1.22.2.27 Makefile
@@ -39,11 +39,11 @@
 LINKFLAGS	+= -G 0 -static # -N
 MODFLAGS	+= -mlong-calls
 
-ifdef CONFIG_KGDB
+ifdef CONFIG_DEBUG_INFO
 GCCFLAGS	+= -g
+endif
 ifdef CONFIG_SB1XXX_CORELIS
 GCCFLAGS	+= -mno-sched-prolog -fno-omit-frame-pointer
-endif
 endif
 
 check_gcc = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi)
#5 lore raw

Re: [PATCH] add CONFIG_DEBUG_INFO

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"kip" == Kip Walker <[email protected]> writes:

Hi again

kip> diff -u -r1.78.2.23 Makefile
kip> --- arch/mips/Makefile 26 Feb 2003 21:14:23 -0000 1.78.2.23
kip> +++ arch/mips/Makefile 6 Mar 2003 16:43:59 -0000
kip> @@ -41,11 +41,11 @@
kip> LINKFLAGS += -G 0 -static # -N
kip> MODFLAGS += -mlong-calls

kip> -ifdef CONFIG_KGDB
kip> +ifdef CONFIG_DEBUG_INFO
kip> GCCFLAGS += -g
kip> +endif
kip> ifdef CONFIG_SB1XXX_CORELIS
kip> GCCFLAGS += -mno-sched-prolog -fno-omit-frame-pointer
kip> -endif
kip> endif

I have no idea what the Corelis debugger is, but I assume that putting it configuration out of the CONFIG_KGDB is intentional? It doesn't require the -g option?

Later, Juan.

Signature · 2 lines
In theory, practice and theory are the same, but in practice they 
are different -- Larry McVoy
#6 lore raw

Re: [PATCH] add CONFIG_DEBUG_INFO

Quoted 3 lines · Juan Quintela

I have no idea what the Corelis debugger is, but I assume that putting it configuration out of the CONFIG_KGDB is intentional? It doesn't require the -g option?

It's a JTAG debugger.

Ralf

#7 lore raw

Re: [PATCH] add CONFIG_DEBUG_INFO

In reply to Juan Quintela
Quoted 3 lines

I have no idea what the Corelis debugger is, but I assume that putting it configuration out of the CONFIG_KGDB is intentional? It doesn't require the -g option?

Yes -- the patch didn't include it, but the Corelis option will depend on DEBUG_INFO. I just thought removing the nested ifdef was more attractive, and have the configure magic deal with the dependence.