Hi folks,

inlined is the patch that fixes compilation breakage for KGDB on PXA. I;ve sent 
the older version of this one some month ago but I guess it got lost during the 
CVS -> git transition :)

 arch/arm/mach-pxa/kgdb-serial.c |    2 +-
 lib/Kconfig.kgdb                |   17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

 Signed-off-by: Vitaly Wool <[EMAIL PROTECTED]>

Index: linux-2.6.18/arch/arm/mach-pxa/kgdb-serial.c
===================================================================
--- linux-2.6.18.orig/arch/arm/mach-pxa/kgdb-serial.c
+++ linux-2.6.18/arch/arm/mach-pxa/kgdb-serial.c
@@ -63,7 +63,7 @@ static int kgdb_serial_init(void)
        return 0;
 }
 
-static void kgdb_serial_putchar(int c)
+static void kgdb_serial_putchar(u8 c)
 {
        if (!(CKEN & CKEN_UART) || port[UART_IER] != IER_UUE)
                kgdb_serial_init();
Index: linux-2.6.18/lib/Kconfig.kgdb
===================================================================
--- linux-2.6.18.orig/lib/Kconfig.kgdb
+++ linux-2.6.18/lib/Kconfig.kgdb
@@ -135,6 +135,21 @@ config KGDB_PXA_SERIAL
          Enables the KGDB serial driver for Intel PXA SOC
 endchoice
 
+choice
+       prompt "PXA serial UART for KGDB"
+       depends on KGDB_PXA_SERIAL
+       default KGDB_PXA_FFUART
+
+config KGDB_PXA_FFUART
+       bool "FFUART"
+
+config KGDB_PXA_BTUART
+       bool "BTUART"
+
+config KGDB_PXA_STUART
+       bool "STUART"
+endchoice
+
 config KGDBOE
        tristate "KGDB: On ethernet" if !KGDBOE_NOMODULE
        depends on m && KGDB
@@ -169,7 +184,7 @@ config KGDB_SIMPLE_SERIAL
 
 config KGDB_BAUDRATE
        int "Debug serial port baud rate"
-       depends on (KGDB_8250 && KGDB_SIMPLE_SERIAL)
+       depends on (KGDB_8250 && KGDB_SIMPLE_SERIAL) || KGDB_PXA_SERIAL
        default "115200"
        help
          gdb and the kernel stub need to agree on the baud rate to be

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Kgdb-bugreport mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/kgdb-bugreport

Reply via email to