[U-Boot] [PATCH] kgdb: unify kgdb on serial

Jean-Christophe PLAGNIOL-VILLARD plagnioj at jcrosoft.com
Sat May 16 17:23:22 CEST 2009


unify kgdb serial implementatin when we kgdb over the main serial
interface (serial_{getc,putc,puts})

introduce CONFIG_KGDB_ON_SERIAL for this purpose
otherwise use as curently CONFIG_KGDB_SER_INDEX to define the serial
port to use

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
---
 board/Marvell/common/serial.c                      |   26 --------
 board/amirix/ap1000/serial.c                       |   26 --------
 board/esd/cpci750/serial.c                         |   26 --------
 board/evb64260/serial.c                            |   31 ----------
 board/ml2/serial.c                                 |   26 --------
 board/prodrive/p3mx/serial.c                       |   26 --------
 board/xilinx/ml300/serial.c                        |   31 ----------
 common/Makefile                                    |    1 +
 .../p3mx/serial.c => common/kgdb_on_serial.c       |   64 ++-----------------
 cpu/i386/serial.c                                  |   39 +-----------
 cpu/ppc4xx/4xx_uart.c                              |   39 +-----------
 include/configs/CPCI750.h                          |    1 +
 include/configs/DB64360.h                          |    1 +
 include/configs/DB64460.h                          |    1 +
 include/configs/EVB64260.h                         |    1 +
 include/configs/ML2.h                              |    1 +
 include/configs/P3G4.h                             |    1 +
 include/configs/VCMA9.h                            |    2 +-
 include/configs/ZUMA.h                             |    1 +
 include/configs/actux1.h                           |    2 +-
 include/configs/actux2.h                           |    2 +-
 include/configs/actux3.h                           |    2 +-
 include/configs/actux4.h                           |    2 +-
 include/configs/davinci_dvevm.h                    |    2 +-
 include/configs/davinci_schmoogie.h                |    2 +-
 include/configs/davinci_sffsdr.h                   |    2 +-
 include/configs/davinci_sonata.h                   |    2 +-
 include/configs/lpd7a400.h                         |    2 +-
 include/configs/lpd7a404.h                         |    2 +-
 include/configs/mx1ads.h                           |    2 +-
 include/configs/ns9750dev.h                        |    2 +-
 include/configs/omap1510inn.h                      |    2 +-
 include/configs/omap1610h2.h                       |    2 +-
 include/configs/omap1610inn.h                      |    2 +-
 include/configs/omap5912osk.h                      |    2 +-
 include/configs/omap730p2.h                        |    2 +-
 include/configs/p3mx.h                             |    1 +
 include/configs/sbc2410x.h                         |    2 +-
 include/configs/smdk2400.h                         |    2 +-
 include/configs/smdk2410.h                         |    2 +-
 include/configs/smdk6400.h                         |    2 +-
 include/configs/trab.h                             |    2 +-
 include/configs/xaeniax.h                          |    2 +-
 43 files changed, 46 insertions(+), 345 deletions(-)
 copy board/prodrive/p3mx/serial.c => common/kgdb_on_serial.c (57%)

diff --git a/board/Marvell/common/serial.c b/board/Marvell/common/serial.c
index 3e7f406..36c40fe 100644
--- a/board/Marvell/common/serial.c
+++ b/board/Marvell/common/serial.c
@@ -144,29 +144,3 @@ void serial_puts (const char *s)
 		serial_putc (*s++);
 	}
 }
-
-#if defined(CONFIG_CMD_KGDB)
-void kgdb_serial_init (void)
-{
-}
-
-void putDebugChar (int c)
-{
-	serial_putc (c);
-}
-
-void putDebugStr (const char *str)
-{
-	serial_puts (str);
-}
-
-int getDebugChar (void)
-{
-	return serial_getc ();
-}
-
-void kgdb_interruptible (int yes)
-{
-	return;
-}
-#endif
diff --git a/board/amirix/ap1000/serial.c b/board/amirix/ap1000/serial.c
index 87003be..ca46a88 100644
--- a/board/amirix/ap1000/serial.c
+++ b/board/amirix/ap1000/serial.c
@@ -83,29 +83,3 @@ void serial_puts (const char *s)
 		serial_putc (*s++);
 	}
 }
-
-#if defined(CONFIG_CMD_KGDB)
-void kgdb_serial_init (void)
-{
-}
-
-void putDebugChar (int c)
-{
-	serial_putc (c);
-}
-
-void putDebugStr (const char *str)
-{
-	serial_puts (str);
-}
-
-int getDebugChar (void)
-{
-	return serial_getc ();
-}
-
-void kgdb_interruptible (int yes)
-{
-	return;
-}
-#endif
diff --git a/board/esd/cpci750/serial.c b/board/esd/cpci750/serial.c
index e1af37e..69e8780 100644
--- a/board/esd/cpci750/serial.c
+++ b/board/esd/cpci750/serial.c
@@ -79,29 +79,3 @@ void serial_puts (const char *s)
 		serial_putc (*s++);
 	}
 }
-
-#if defined(CONFIG_CMD_KGDB)
-void kgdb_serial_init (void)
-{
-}
-
-void putDebugChar (int c)
-{
-	serial_putc (c);
-}
-
-void putDebugStr (const char *str)
-{
-	serial_puts (str);
-}
-
-int getDebugChar (void)
-{
-	return serial_getc ();
-}
-
-void kgdb_interruptible (int yes)
-{
-	return;
-}
-#endif
diff --git a/board/evb64260/serial.c b/board/evb64260/serial.c
index 9d71115..dbc4ee8 100644
--- a/board/evb64260/serial.c
+++ b/board/evb64260/serial.c
@@ -152,34 +152,3 @@ serial_puts (const char *s)
 		serial_putc (*s++);
 	}
 }
-
-#if defined(CONFIG_CMD_KGDB)
-void
-kgdb_serial_init(void)
-{
-}
-
-void
-putDebugChar (int c)
-{
-	serial_putc (c);
-}
-
-void
-putDebugStr (const char *str)
-{
-	serial_puts (str);
-}
-
-int
-getDebugChar (void)
-{
-	return serial_getc();
-}
-
-void
-kgdb_interruptible (int yes)
-{
-	return;
-}
-#endif
diff --git a/board/ml2/serial.c b/board/ml2/serial.c
index d9113ab..d9f8996 100644
--- a/board/ml2/serial.c
+++ b/board/ml2/serial.c
@@ -87,29 +87,3 @@ void serial_puts (const char *s)
 		serial_putc (*s++);
 	}
 }
-
-#if defined(CONFIG_CMD_KGDB)
-void kgdb_serial_init (void)
-{
-}
-
-void putDebugChar (int c)
-{
-	serial_putc (c);
-}
-
-void putDebugStr (const char *str)
-{
-	serial_puts (str);
-}
-
-int getDebugChar (void)
-{
-	return serial_getc ();
-}
-
-void kgdb_interruptible (int yes)
-{
-	return;
-}
-#endif
diff --git a/board/prodrive/p3mx/serial.c b/board/prodrive/p3mx/serial.c
index e1af37e..69e8780 100644
--- a/board/prodrive/p3mx/serial.c
+++ b/board/prodrive/p3mx/serial.c
@@ -79,29 +79,3 @@ void serial_puts (const char *s)
 		serial_putc (*s++);
 	}
 }
-
-#if defined(CONFIG_CMD_KGDB)
-void kgdb_serial_init (void)
-{
-}
-
-void putDebugChar (int c)
-{
-	serial_putc (c);
-}
-
-void putDebugStr (const char *str)
-{
-	serial_puts (str);
-}
-
-int getDebugChar (void)
-{
-	return serial_getc ();
-}
-
-void kgdb_interruptible (int yes)
-{
-	return;
-}
-#endif
diff --git a/board/xilinx/ml300/serial.c b/board/xilinx/ml300/serial.c
index 4215513..6add295 100644
--- a/board/xilinx/ml300/serial.c
+++ b/board/xilinx/ml300/serial.c
@@ -121,34 +121,3 @@ serial_puts(const char *s)
 		serial_putc(*s++);
 	}
 }
-
-#if defined(CONFIG_CMD_KGDB)
-void
-kgdb_serial_init(void)
-{
-}
-
-void
-putDebugChar(int c)
-{
-	serial_putc(c);
-}
-
-void
-putDebugStr(const char *str)
-{
-	serial_puts(str);
-}
-
-int
-getDebugChar(void)
-{
-	return serial_getc();
-}
-
-void
-kgdb_interruptible(int yes)
-{
-	return;
-}
-#endif
diff --git a/common/Makefile b/common/Makefile
index f47e2ed..235d640 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -153,6 +153,7 @@ COBJS-$(CONFIG_CMD_DOC) += docecc.o
 COBJS-$(CONFIG_CONSOLE_MUX) += iomux.o
 COBJS-y += flash.o
 COBJS-$(CONFIG_CMD_KGDB) += kgdb.o
+COBJS-$(CONFIG_KGDB_ON_SERIAL) += kgdb_on_serial.o
 COBJS-$(CONFIG_LCD) += lcd.o
 COBJS-$(CONFIG_LYNXKDI) += lynxkdi.o
 COBJS-$(CONFIG_UPDATE_TFTP) += update.o
diff --git a/board/prodrive/p3mx/serial.c b/common/kgdb_on_serial.c
similarity index 57%
copy from board/prodrive/p3mx/serial.c
copy to common/kgdb_on_serial.c
index e1af37e..f37e7b3 100644
--- a/board/prodrive/p3mx/serial.c
+++ b/common/kgdb_on_serial.c
@@ -1,12 +1,14 @@
 /*
+ * (C) Copyright 2000-2006
+ * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+ *
  * (C) Copyright 2001
  * Josh Huber <huber at mclx.com>, Mission Critical Linux, Inc.
  *
- * modified for marvell db64360 eval board by
- * Ingo Assmus <ingo.assmus at keymile.com>
+ * (C) Copyright 2002
+ * Peter De Schrijver (p2 at mind.be), Mind Linux Solutions, NV.
  *
- * modified for cpci750 board by
- * Reinhard Arlt <reinhard.arlt at esd-electronics.com>
+ * (C) Copyright 2002-2004 Xilinx Inc.
  *
  * See file CREDITS for list of people who contributed to this
  * project.
@@ -27,62 +29,11 @@
  * MA 02111-1307 USA
  */
 
-/*
- * serial.c - serial support for esd cpci750 board
- */
-
-/* supports the MPSC */
-
 #include <common.h>
-#include <command.h>
-#include "../../Marvell/include/memory.h"
-#include "serial.h"
-
-#include "mpsc.h"
-
-DECLARE_GLOBAL_DATA_PTR;
-
-int serial_init (void)
-{
-	mpsc_init (gd->baudrate);
-
-	return (0);
-}
-
-void serial_putc (const char c)
-{
-	if (c == '\n')
-		mpsc_putchar ('\r');
-
-	mpsc_putchar (c);
-}
-
-int serial_getc (void)
-{
-	return mpsc_getchar ();
-}
-
-int serial_tstc (void)
-{
-	return mpsc_test_char ();
-}
-
-void serial_setbrg (void)
-{
-	galbrg_set_baudrate (CONFIG_MPSC_PORT, gd->baudrate);
-}
-
-
-void serial_puts (const char *s)
-{
-	while (*s) {
-		serial_putc (*s++);
-	}
-}
 
-#if defined(CONFIG_CMD_KGDB)
 void kgdb_serial_init (void)
 {
+	serial_printf ("[on serial] ");
 }
 
 void putDebugChar (int c)
@@ -104,4 +55,3 @@ void kgdb_interruptible (int yes)
 {
 	return;
 }
-#endif
diff --git a/cpu/i386/serial.c b/cpu/i386/serial.c
index 8b5f8fa..a495f85 100644
--- a/cpu/i386/serial.c
+++ b/cpu/i386/serial.c
@@ -394,16 +394,11 @@ int serial_buffered_tstc(void)
 #endif	/* CONFIG_SERIAL_SOFTWARE_FIFO */
 
 
-#if defined(CONFIG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB) && (CONFIG_KGDB_SER_INDEX & 2)
 /*
-  AS HARNOIS : according to CONFIG_KGDB_SER_INDEX kgdb uses serial port
-  number 0 or number 1
-  - if CONFIG_KGDB_SER_INDEX = 1 => serial port number 0 :
-  configuration has been already done
-  - if CONFIG_KGDB_SER_INDEX = 2 => serial port number 1 :
-  configure port 1 for serial I/O with rate = CONFIG_KGDB_BAUDRATE
+ * use the serial number 1
+ * configure port 1 for serial I/O with rate = CONFIG_KGDB_BAUDRATE
 */
-#if (CONFIG_KGDB_SER_INDEX & 2)
 void kgdb_serial_init(void)
 {
 	volatile char val;
@@ -472,32 +467,4 @@ void kgdb_interruptible(int yes)
 {
 	return;
 }
-
-#else	/* ! (CONFIG_KGDB_SER_INDEX & 2) */
-
-void kgdb_serial_init(void)
-{
-	serial_printf ("[on serial] ");
-}
-
-void putDebugChar(int c)
-{
-	serial_putc (c);
-}
-
-void putDebugStr(const char *str)
-{
-	serial_puts (str);
-}
-
-int getDebugChar(void)
-{
-	return serial_getc ();
-}
-
-void kgdb_interruptible(int yes)
-{
-	return;
-}
-#endif	/* (CONFIG_KGDB_SER_INDEX & 2) */
 #endif
diff --git a/cpu/ppc4xx/4xx_uart.c b/cpu/ppc4xx/4xx_uart.c
index c106ac2..692b801 100644
--- a/cpu/ppc4xx/4xx_uart.c
+++ b/cpu/ppc4xx/4xx_uart.c
@@ -644,16 +644,11 @@ int serial_buffered_tstc (void)
 
 #endif	/* CONFIG_SERIAL_SOFTWARE_FIFO */
 
-#if defined(CONFIG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB) && (CONFIG_KGDB_SER_INDEX & 2)
 /*
-  AS HARNOIS : according to CONFIG_KGDB_SER_INDEX kgdb uses serial port
-  number 0 or number 1
-  - if CONFIG_KGDB_SER_INDEX = 1 => serial port number 0 :
-  configuration has been already done
-  - if CONFIG_KGDB_SER_INDEX = 2 => serial port number 1 :
-  configure port 1 for serial I/O with rate = CONFIG_KGDB_BAUDRATE
+ * use serial port number 1 :
+ * configure port 1 for serial I/O with rate = CONFIG_KGDB_BAUDRATE
 */
-#if (CONFIG_KGDB_SER_INDEX & 2)
 void kgdb_serial_init (void)
 {
 	u8 val;
@@ -722,34 +717,6 @@ void kgdb_interruptible (int yes)
 {
 	return;
 }
-
-#else	/* ! (CONFIG_KGDB_SER_INDEX & 2) */
-
-void kgdb_serial_init (void)
-{
-	serial_printf ("[on serial] ");
-}
-
-void putDebugChar (int c)
-{
-	serial_putc (c);
-}
-
-void putDebugStr (const char *str)
-{
-	serial_puts (str);
-}
-
-int getDebugChar (void)
-{
-	return serial_getc ();
-}
-
-void kgdb_interruptible (int yes)
-{
-	return;
-}
-#endif	/* (CONFIG_KGDB_SER_INDEX & 2) */
 #endif
 
 
diff --git a/include/configs/CPCI750.h b/include/configs/CPCI750.h
index 8494faa..8c9a957 100644
--- a/include/configs/CPCI750.h
+++ b/include/configs/CPCI750.h
@@ -189,6 +189,7 @@
 #define CONFIG_SYS_LONGHELP			/* undef to save memory		*/
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 #if defined(CONFIG_CMD_KGDB)
+#define CONFIG_KGDB_ON_SERIAL
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
 #else
 #define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size	*/
diff --git a/include/configs/DB64360.h b/include/configs/DB64360.h
index 160871b..9d6228e 100644
--- a/include/configs/DB64360.h
+++ b/include/configs/DB64360.h
@@ -273,6 +273,7 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
 #define CONFIG_SYS_LONGHELP			/* undef to save memory		*/
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 #if defined(CONFIG_CMD_KGDB)
+#define CONFIG_KGDB_ON_SERIAL
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
 #else
 #define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size	*/
diff --git a/include/configs/DB64460.h b/include/configs/DB64460.h
index 06fd157..899b645 100644
--- a/include/configs/DB64460.h
+++ b/include/configs/DB64460.h
@@ -211,6 +211,7 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
 #define CONFIG_SYS_LONGHELP			/* undef to save memory		*/
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 #if defined(CONFIG_CMD_KGDB)
+#define CONFIG_KGDB_ON_SERIAL
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
 #else
 #define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size	*/
diff --git a/include/configs/EVB64260.h b/include/configs/EVB64260.h
index bf41c13..18855eb 100644
--- a/include/configs/EVB64260.h
+++ b/include/configs/EVB64260.h
@@ -127,6 +127,7 @@
 #define	CONFIG_SYS_LONGHELP			/* undef to save memory		*/
 #define	CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 #if defined(CONFIG_CMD_KGDB)
+#define CONFIG_KGDB_ON_SERIAL
 #define	CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
 #else
 #define	CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size	*/
diff --git a/include/configs/ML2.h b/include/configs/ML2.h
index 5fcc173..fa85d51 100644
--- a/include/configs/ML2.h
+++ b/include/configs/ML2.h
@@ -114,6 +114,7 @@
 #define CONFIG_SYS_LONGHELP			/* undef to save memory		*/
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 #if defined(CONFIG_CMD_KGDB)
+#define CONFIG_KGDB_ON_SERIAL
 #define	CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
 #else
 #define	CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size	*/
diff --git a/include/configs/P3G4.h b/include/configs/P3G4.h
index 971338a..df6d19c 100644
--- a/include/configs/P3G4.h
+++ b/include/configs/P3G4.h
@@ -154,6 +154,7 @@
 #define	CONFIG_SYS_LONGHELP			/* undef to save memory		*/
 #define	CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 #if defined(CONFIG_CMD_KGDB)
+#define CONFIG_KGDB_ON_SERIAL
 #define	CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
 #else
 #define	CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size	*/
diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h
index 1bab0f1..d286d07 100644
--- a/include/configs/VCMA9.h
+++ b/include/configs/VCMA9.h
@@ -155,7 +155,7 @@
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE	115200		/* speed to run kgdb serial port */
 /* what's this ? it's not used anywhere */
-#define CONFIG_KGDB_SER_INDEX	1		/* which serial port to use */
+#define CONFIG_KGDB_ON_SERIAL		/* which serial port to use */
 #endif
 
 /*
diff --git a/include/configs/ZUMA.h b/include/configs/ZUMA.h
index b73aaa8..e9dc3dc 100644
--- a/include/configs/ZUMA.h
+++ b/include/configs/ZUMA.h
@@ -149,6 +149,7 @@
 #define CONFIG_SYS_LONGHELP			/* undef to save memory		*/
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/
 #if defined(CONFIG_CMD_KGDB)
+#define CONFIG_KGDB_ON_SERIAL
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/
 #else
 #define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size	*/
diff --git a/include/configs/actux1.h b/include/configs/actux1.h
index 91f6ff0..c71bda7 100644
--- a/include/configs/actux1.h
+++ b/include/configs/actux1.h
@@ -77,7 +77,7 @@
 #if defined(CONFIG_CMD_KGDB)
 # define CONFIG_KGDB_BAUDRATE		230400
 /* which serial port to use */
-# define CONFIG_KGDB_SER_INDEX		1
+# define CONFIG_KGDB_ON_SERIAL
 #endif
 
 /* Miscellaneous configurable options */
diff --git a/include/configs/actux2.h b/include/configs/actux2.h
index b936938..98a6787 100644
--- a/include/configs/actux2.h
+++ b/include/configs/actux2.h
@@ -68,7 +68,7 @@
 #if defined(CONFIG_CMD_KGDB)
 # define CONFIG_KGDB_BAUDRATE		230400
 /* which serial port to use */
-# define CONFIG_KGDB_SER_INDEX		1
+# define CONFIG_KGDB_ON_SERIAL
 #endif
 
 /* Miscellaneous configurable options */
diff --git a/include/configs/actux3.h b/include/configs/actux3.h
index f5ee899..4c37f2d 100644
--- a/include/configs/actux3.h
+++ b/include/configs/actux3.h
@@ -66,7 +66,7 @@
 #if defined(CONFIG_CMD_KGDB)
 # define CONFIG_KGDB_BAUDRATE		230400
 /* which serial port to use */
-# define CONFIG_KGDB_SER_INDEX		1
+# define CONFIG_KGDB_ON_SERIAL
 #endif
 
 /* Miscellaneous configurable options */
diff --git a/include/configs/actux4.h b/include/configs/actux4.h
index 8d70a26..13fc084 100644
--- a/include/configs/actux4.h
+++ b/include/configs/actux4.h
@@ -65,7 +65,7 @@
 #if defined(CONFIG_CMD_KGDB)
 # define CONFIG_KGDB_BAUDRATE		230400
 /* which serial port to use */
-# define CONFIG_KGDB_SER_INDEX		1
+# define CONFIG_KGDB_ON_SERIAL
 #endif
 
 /* Miscellaneous configurable options */
diff --git a/include/configs/davinci_dvevm.h b/include/configs/davinci_dvevm.h
index 6c5d065..2309bf2 100644
--- a/include/configs/davinci_dvevm.h
+++ b/include/configs/davinci_dvevm.h
@@ -235,6 +235,6 @@
 /*=======================*/
 #ifdef CONFIG_CMD_KGDB
 #define CONFIG_KGDB_BAUDRATE	115200	/* speed to run kgdb serial port */
-#define CONFIG_KGDB_SER_INDEX	1	/* which serial port to use */
+#define CONFIG_KGDB_ON_SERIAL	/* which serial port to use */
 #endif
 #endif /* __CONFIG_H */
diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h
index 6612cb3..db795aa 100644
--- a/include/configs/davinci_schmoogie.h
+++ b/include/configs/davinci_schmoogie.h
@@ -153,6 +153,6 @@
 /*=======================*/
 #ifdef CONFIG_CMD_KGDB
 #define CONFIG_KGDB_BAUDRATE	115200	/* speed to run kgdb serial port */
-#define CONFIG_KGDB_SER_INDEX	1	/* which serial port to use */
+#define CONFIG_KGDB_ON_SERIAL	/* which serial port to use */
 #endif
 #endif /* __CONFIG_H */
diff --git a/include/configs/davinci_sffsdr.h b/include/configs/davinci_sffsdr.h
index 6c1dc11..349d3ba 100644
--- a/include/configs/davinci_sffsdr.h
+++ b/include/configs/davinci_sffsdr.h
@@ -146,6 +146,6 @@
 /* KGDB support (if any) */
 #ifdef CONFIG_CMD_KGDB
 #define CONFIG_KGDB_BAUDRATE	115200	/* speed to run kgdb serial port */
-#define CONFIG_KGDB_SER_INDEX	1	/* which serial port to use */
+#define CONFIG_KGDB_ON_SERIAL	/* which serial port to use */
 #endif
 #endif /* __CONFIG_H */
diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h
index 893729c..c602321 100644
--- a/include/configs/davinci_sonata.h
+++ b/include/configs/davinci_sonata.h
@@ -205,6 +205,6 @@
 /*=======================*/
 #ifdef CONFIG_CMD_KGDB
 #define CONFIG_KGDB_BAUDRATE	115200	/* speed to run kgdb serial port */
-#define CONFIG_KGDB_SER_INDEX	1	/* which serial port to use */
+#define CONFIG_KGDB_ON_SERIAL	/* which serial port to use */
 #endif
 #endif /* __CONFIG_H */
diff --git a/include/configs/lpd7a400.h b/include/configs/lpd7a400.h
index b1bd74f..b4b858b 100644
--- a/include/configs/lpd7a400.h
+++ b/include/configs/lpd7a400.h
@@ -83,7 +83,7 @@
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE	115200		/* speed to run kgdb serial port */
 /* what's this ? it's not used anywhere */
-#define CONFIG_KGDB_SER_INDEX	1		/* which serial port to use */
+#define CONFIG_KGDB_ON_SERIAL		/* which serial port to use */
 #endif
 
 /*
diff --git a/include/configs/lpd7a404.h b/include/configs/lpd7a404.h
index b197674..fb9aebc 100644
--- a/include/configs/lpd7a404.h
+++ b/include/configs/lpd7a404.h
@@ -83,7 +83,7 @@
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE	115200		/* speed to run kgdb serial port */
 /* what's this ? it's not used anywhere */
-#define CONFIG_KGDB_SER_INDEX	1		/* which serial port to use */
+#define CONFIG_KGDB_ON_SERIAL		/* which serial port to use */
 #endif
 
 /*
diff --git a/include/configs/mx1ads.h b/include/configs/mx1ads.h
index 12e567b..005a1ff 100644
--- a/include/configs/mx1ads.h
+++ b/include/configs/mx1ads.h
@@ -107,7 +107,7 @@
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE	115200		/* speed to run kgdb serial port */
 						/* what's this ? it's not used anywhere */
-#define CONFIG_KGDB_SER_INDEX	1		/* which serial port to use */
+#define CONFIG_KGDB_ON_SERIAL		/* which serial port to use */
 #endif
 
 /*
diff --git a/include/configs/ns9750dev.h b/include/configs/ns9750dev.h
index 79dcd64..a198cfc 100644
--- a/include/configs/ns9750dev.h
+++ b/include/configs/ns9750dev.h
@@ -106,7 +106,7 @@
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE	115200		/* speed to run kgdb serial port */
 /* what's this ? it's not used anywhere */
-#define CONFIG_KGDB_SER_INDEX	1		/* which serial port to use */
+#define CONFIG_KGDB_ON_SERIAL		/* which serial port to use */
 #endif
 
 /*
diff --git a/include/configs/omap1510inn.h b/include/configs/omap1510inn.h
index 8408209..65712e8 100644
--- a/include/configs/omap1510inn.h
+++ b/include/configs/omap1510inn.h
@@ -114,7 +114,7 @@
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE	115200		/* speed to run kgdb serial port */
 /* what's this ? it's not used anywhere */
-#define CONFIG_KGDB_SER_INDEX	1		/* which serial port to use */
+#define CONFIG_KGDB_ON_SERIAL		/* which serial port to use */
 #endif
 
 /*
diff --git a/include/configs/omap1610h2.h b/include/configs/omap1610h2.h
index 42e0198..c485eea 100644
--- a/include/configs/omap1610h2.h
+++ b/include/configs/omap1610h2.h
@@ -108,7 +108,7 @@
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE	115200	/* speed to run kgdb serial port */
-#define CONFIG_KGDB_SER_INDEX	1	/* which serial port to use */
+#define CONFIG_KGDB_ON_SERIAL	/* which serial port to use */
 #endif
 
 /*
diff --git a/include/configs/omap1610inn.h b/include/configs/omap1610inn.h
index 22c873e..aa28116 100644
--- a/include/configs/omap1610inn.h
+++ b/include/configs/omap1610inn.h
@@ -113,7 +113,7 @@
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE	115200	/* speed to run kgdb serial port */
-#define CONFIG_KGDB_SER_INDEX	1	/* which serial port to use */
+#define CONFIG_KGDB_ON_SERIAL	/* which serial port to use */
 #endif
 
 /*
diff --git a/include/configs/omap5912osk.h b/include/configs/omap5912osk.h
index d0ce9dc..be55579 100644
--- a/include/configs/omap5912osk.h
+++ b/include/configs/omap5912osk.h
@@ -117,7 +117,7 @@
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE	115200	/* speed to run kgdb serial port */
-#define CONFIG_KGDB_SER_INDEX	1	/* which serial port to use */
+#define CONFIG_KGDB_ON_SERIAL	/* which serial port to use */
 #endif
 
 /*
diff --git a/include/configs/omap730p2.h b/include/configs/omap730p2.h
index 32a9b23..26057eb 100644
--- a/include/configs/omap730p2.h
+++ b/include/configs/omap730p2.h
@@ -124,7 +124,7 @@
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE	   115200    /* Speed to run kgdb serial port */
-#define CONFIG_KGDB_SER_INDEX	   1	     /* Which serial port to use */
+#define CONFIG_KGDB_ON_SERIAL	     /* Which serial port to use */
 #endif
 
 /*
diff --git a/include/configs/p3mx.h b/include/configs/p3mx.h
index 5e4d30b..c9392be 100644
--- a/include/configs/p3mx.h
+++ b/include/configs/p3mx.h
@@ -291,6 +291,7 @@
 #define CONFIG_SYS_LONGHELP			/* undef to save memory		*/
 #define CONFIG_SYS_PROMPT	        "=> "	/* Monitor Command Prompt	*/
 #if defined(CONFIG_CMD_KGDB)
+#define CONFIG_KGDB_ON_SERIAL
 #define CONFIG_SYS_CBSIZE	        1024	/* Console I/O Buffer Size	*/
 #else
 #define CONFIG_SYS_CBSIZE	        256	/* Console I/O Buffer Size	*/
diff --git a/include/configs/sbc2410x.h b/include/configs/sbc2410x.h
index d0ee582..31aaa51 100644
--- a/include/configs/sbc2410x.h
+++ b/include/configs/sbc2410x.h
@@ -121,7 +121,7 @@
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE	115200		/* speed to run kgdb serial port */
 /* what's this ? it's not used anywhere */
-#define CONFIG_KGDB_SER_INDEX	1		/* which serial port to use */
+#define CONFIG_KGDB_ON_SERIAL		/* which serial port to use */
 #endif
 
 /*
diff --git a/include/configs/smdk2400.h b/include/configs/smdk2400.h
index 20adfca..5a471fb 100644
--- a/include/configs/smdk2400.h
+++ b/include/configs/smdk2400.h
@@ -123,7 +123,7 @@
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE	115200		/* speed to run kgdb serial port */
 /* what's this ? it's not used anywhere */
-#define CONFIG_KGDB_SER_INDEX	1		/* which serial port to use */
+#define CONFIG_KGDB_ON_SERIAL		/* which serial port to use */
 #endif
 
 /*
diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h
index 0215e99..8acb7d6 100644
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -106,7 +106,7 @@
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE	115200		/* speed to run kgdb serial port */
 /* what's this ? it's not used anywhere */
-#define CONFIG_KGDB_SER_INDEX	1		/* which serial port to use */
+#define CONFIG_KGDB_ON_SERIAL		/* which serial port to use */
 #endif
 
 /*
diff --git a/include/configs/smdk6400.h b/include/configs/smdk6400.h
index cac58cf..2973941 100644
--- a/include/configs/smdk6400.h
+++ b/include/configs/smdk6400.h
@@ -120,7 +120,7 @@
 
 #if (CONFIG_COMMANDS & CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE	115200	/* speed to run kgdb serial port */
-#define CONFIG_KGDB_SER_INDEX	1	/* which serial port to use	 */
+#define CONFIG_KGDB_ON_SERIAL	/* which serial port to use	 */
 #endif
 
 /*
diff --git a/include/configs/trab.h b/include/configs/trab.h
index cb5a051..544a503 100644
--- a/include/configs/trab.h
+++ b/include/configs/trab.h
@@ -298,7 +298,7 @@
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE	115200		/* speed to run kgdb serial port */
 /* what's this ? it's not used anywhere */
-#define CONFIG_KGDB_SER_INDEX	1		/* which serial port to use */
+#define CONFIG_KGDB_ON_SERIAL		/* which serial port to use */
 #endif
 
 /*
diff --git a/include/configs/xaeniax.h b/include/configs/xaeniax.h
index 1632d29..8999130 100644
--- a/include/configs/xaeniax.h
+++ b/include/configs/xaeniax.h
@@ -105,7 +105,7 @@
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE	115200			/* speed to run kgdb serial port */
-#define CONFIG_KGDB_SER_INDEX	1			/* which serial port to use */
+#define CONFIG_KGDB_ON_SERIAL			/* which serial port to use */
 #endif
 
 /*
-- 
1.6.1.3



More information about the U-Boot mailing list