Get rid of *all* the remains of the arch/ppc specific KGDB implementation.
Signed-off-by: Sergey Shtylyov <[EMAIL PROTECTED]>
---
The patch is against the top of KGDB patchset in the linux_2_6_21_uprev branch.
arch/ppc/amiga/config.c | 6 ------
arch/ppc/platforms/4xx/taishan.c | 7 ++-----
arch/ppc/platforms/4xx/xilinx_ml403.c | 8 +-------
arch/ppc/platforms/4xx/yucca.c | 3 ---
arch/ppc/platforms/apus_setup.c | 6 ------
arch/ppc/platforms/ev64260.c | 12 ++----------
arch/ppc/platforms/hdpu.c | 19 -------------------
arch/ppc/platforms/radstone_ppc7d.c | 12 +++++-------
8 files changed, 10 insertions(+), 63 deletions(-)
Index: linux-2.6/arch/ppc/amiga/config.c
===================================================================
--- linux-2.6.orig/arch/ppc/amiga/config.c
+++ linux-2.6/arch/ppc/amiga/config.c
@@ -753,17 +753,11 @@ static void amiga_serial_putc(char c)
void amiga_serial_console_write(struct console *co, const char *s,
unsigned int count)
{
-#if 0 /* def CONFIG_KGDB */
- /* FIXME:APUS GDB doesn't seem to like O-packages before it is
- properly connected with the target. */
- __gdb_output_string (s, count);
-#else
while (count--) {
if (*s == '\n')
amiga_serial_putc('\r');
amiga_serial_putc(*s++);
}
-#endif
}
#ifdef CONFIG_SERIAL_CONSOLE
Index: linux-2.6/arch/ppc/platforms/4xx/taishan.c
===================================================================
--- linux-2.6.orig/arch/ppc/platforms/4xx/taishan.c
+++ linux-2.6/arch/ppc/platforms/4xx/taishan.c
@@ -310,7 +310,7 @@ taishan_early_serial_map(void)
if (early_serial_setup(&port) != 0)
printk("Early serial init of port 0 failed\n");
-#if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
+#ifdef CONFIG_SERIAL_TEXT_DEBUG
/* Configure debug serial access */
gen550_init(0, &port);
@@ -326,7 +326,7 @@ taishan_early_serial_map(void)
if (early_serial_setup(&port) != 0)
printk("Early serial init of port 1 failed\n");
-#if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
+#ifdef CONFIG_SERIAL_TEXT_DEBUG
/* Configure debug serial access */
gen550_init(1, &port);
#endif
@@ -387,9 +387,6 @@ void __init platform_init(unsigned long
ppc_md.calibrate_decr = taishan_calibrate_decr;
-#ifdef CONFIG_KGDB
- ppc_md.early_serial_map = taishan_early_serial_map;
-#endif
ppc_md.init = taishan_init;
}
Index: linux-2.6/arch/ppc/platforms/4xx/xilinx_ml403.c
===================================================================
--- linux-2.6.orig/arch/ppc/platforms/4xx/xilinx_ml403.c
+++ linux-2.6/arch/ppc/platforms/4xx/xilinx_ml403.c
@@ -45,9 +45,6 @@
* ppc4xx_map_io arch/ppc/syslib/ppc4xx_setup.c
* start_kernel init/main.c
* setup_arch arch/ppc/kernel/setup.c
- * #if defined(CONFIG_KGDB)
- * *ppc_md.kgdb_map_scc() == gen550_kgdb_map_scc
- * #endif
* *ppc_md.setup_arch == ml403_setup_arch this file
* ppc4xx_setup_arch arch/ppc/syslib/ppc4xx_setup.c
* ppc4xx_find_bridges
arch/ppc/syslib/ppc405_pci.c
@@ -103,7 +100,7 @@ ml403_map_io(void)
static void __init
ml403_early_serial_init(int num, struct plat_serial8250_port *pdata)
{
-#if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
+#ifdef CONFIG_SERIAL_TEXT_DEBUG
struct uart_port serial_req;
memset(&serial_req, 0, sizeof(serial_req));
@@ -169,8 +166,5 @@ platform_init(unsigned long r3, unsigned
ppc_md.power_off = xilinx_power_off;
#endif
-#ifdef CONFIG_KGDB
- ppc_md.early_serial_map = ml403_early_serial_map;
-#endif
}
Index: linux-2.6/arch/ppc/platforms/4xx/yucca.c
===================================================================
--- linux-2.6.orig/arch/ppc/platforms/4xx/yucca.c
+++ linux-2.6/arch/ppc/platforms/4xx/yucca.c
@@ -386,7 +386,4 @@ void __init platform_init(unsigned long
ppc_md.get_irq = NULL; /* Set in ppc4xx_pic_init() */
ppc_md.calibrate_decr = yucca_calibrate_decr;
-#ifdef CONFIG_KGDB
- ppc_md.early_serial_map = yucca_early_serial_map;
-#endif
}
Index: linux-2.6/arch/ppc/platforms/apus_setup.c
===================================================================
--- linux-2.6.orig/arch/ppc/platforms/apus_setup.c
+++ linux-2.6/arch/ppc/platforms/apus_setup.c
@@ -598,12 +598,6 @@ int __debug_serinit( void )
ciab.ddra |= (SER_DTR | SER_RTS); /* outputs */
ciab.ddra &= ~(SER_DCD | SER_CTS | SER_DSR); /* inputs */
-#ifdef CONFIG_KGDB
- /* turn Rx interrupts on for GDB */
- amiga_custom.intena = IF_SETCLR | IF_RBF;
- ser_RTSon();
-#endif
-
return 0;
}
Index: linux-2.6/arch/ppc/platforms/ev64260.c
===================================================================
--- linux-2.6.orig/arch/ppc/platforms/ev64260.c
+++ linux-2.6/arch/ppc/platforms/ev64260.c
@@ -330,7 +330,7 @@ ev64260_early_serial_map(void)
port.iotype = UPIO_MEM;
port.flags = STD_COM_FLAGS;
-#if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
+#ifdef CONFIG_SERIAL_TEXT_DEBUG
gen550_init(0, &port);
#endif
@@ -568,7 +568,7 @@ ev64260_set_bat(void)
return;
}
-#if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
+#ifdef CONFIG_SERIAL_TEXT_DEBUG
static void __init
ev64260_map_io(void)
{
@@ -624,20 +624,12 @@ platform_init(unsigned long r3, unsigned
ppc_md.setup_io_mappings = ev64260_map_io;
ppc_md.progress = gen550_progress;
#endif
-#if defined(CONFIG_KGDB)
- ppc_md.setup_io_mappings = ev64260_map_io;
- ppc_md.early_serial_map = ev64260_early_serial_map;
-#endif
#elif defined(CONFIG_SERIAL_MPSC_CONSOLE)
#ifdef CONFIG_SERIAL_TEXT_DEBUG
ppc_md.setup_io_mappings = ev64260_map_io;
ppc_md.progress = mv64x60_mpsc_progress;
mv64x60_progress_init(CONFIG_MV64X60_NEW_BASE);
#endif /* CONFIG_SERIAL_TEXT_DEBUG */
-#ifdef CONFIG_KGDB
- ppc_md.setup_io_mappings = ev64260_map_io;
- ppc_md.early_serial_map = ev64260_early_serial_map;
-#endif /* CONFIG_KGDB */
#endif
Index: linux-2.6/arch/ppc/platforms/hdpu.c
===================================================================
--- linux-2.6.orig/arch/ppc/platforms/hdpu.c
+++ linux-2.6/arch/ppc/platforms/hdpu.c
@@ -281,25 +281,6 @@ static void __init hdpu_setup_bridge(voi
#if defined(CONFIG_SERIAL_MPSC_CONSOLE)
static void __init hdpu_early_serial_map(void)
{
-#ifdef CONFIG_KGDB
- static char first_time = 1;
-
-#if defined(CONFIG_KGDB_TTYS0)
-#define KGDB_PORT 0
-#elif defined(CONFIG_KGDB_TTYS1)
-#define KGDB_PORT 1
-#else
-#error "Invalid kgdb_tty port"
-#endif
-
- if (first_time) {
- gt_early_mpsc_init(KGDB_PORT,
- B9600 | CS8 | CREAD | HUPCL | CLOCAL);
- first_time = 0;
- }
-
- return;
-#endif
}
#endif
Index: linux-2.6/arch/ppc/platforms/radstone_ppc7d.c
===================================================================
--- linux-2.6.orig/arch/ppc/platforms/radstone_ppc7d.c
+++ linux-2.6/arch/ppc/platforms/radstone_ppc7d.c
@@ -84,7 +84,7 @@ unsigned char __res[sizeof(bd_t)];
* Serial port code
*****************************************************************************/
-#if defined(CONFIG_KGDB) || defined(CONFIG_SERIAL_TEXT_DEBUG)
+#ifdef CONFIG_SERIAL_TEXT_DEBUG
static void __init ppc7d_early_serial_map(void)
{
#if defined(CONFIG_SERIAL_MPSC_CONSOLE)
@@ -113,10 +113,10 @@ static void __init ppc7d_early_serial_ma
if (early_serial_setup(&serial_req) != 0)
printk(KERN_ERR "Early serial init of port 1 failed\n");
#else
-#error CONFIG_KGDB || CONFIG_SERIAL_TEXT_DEBUG has no supported
CONFIG_SERIAL_XXX
+#error CONFIG_SERIAL_TEXT_DEBUG has no supported CONFIG_SERIAL_XXX
#endif
}
-#endif /* CONFIG_KGDB || CONFIG_SERIAL_TEXT_DEBUG */
+#endif /* CONFIG_SERIAL_TEXT_DEBUG */
/*****************************************************************************
* Low-level board support code
@@ -1459,18 +1459,16 @@ void __init platform_init(unsigned long
PPC7D_CPLD_COMS_COM4_TXEN, PPC7D_CPLD_COMS);
#endif /* CONFIG_SERIAL_MPSC */
-#if defined(CONFIG_KGDB) || defined(CONFIG_SERIAL_TEXT_DEBUG)
+#ifdef CONFIG_SERIAL_TEXT_DEBUG
ppc7d_early_serial_map();
-#ifdef CONFIG_SERIAL_TEXT_DEBUG
#if defined(CONFIG_SERIAL_MPSC_CONSOLE)
ppc_md.progress = mv64x60_mpsc_progress;
#elif defined(CONFIG_SERIAL_8250)
ppc_md.progress = gen550_progress;
#else
-#error CONFIG_KGDB || CONFIG_SERIAL_TEXT_DEBUG has no supported
CONFIG_SERIAL_XXX
+#error CONFIG_SERIAL_TEXT_DEBUG has no supported CONFIG_SERIAL_XXX
#endif /* CONFIG_SERIAL_8250 */
#endif /* CONFIG_SERIAL_TEXT_DEBUG */
-#endif /* CONFIG_KGDB || CONFIG_SERIAL_TEXT_DEBUG */
/* Enable write access to user flash. This is necessary for
* flash probe.
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Kgdb-bugreport mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/kgdb-bugreport
