Backport [7172] to adm5120 mtd map driver

[openwrt.git] / target / linux / ar7-2.6 / files / arch / mips / ar7 / prom.c

diff --git a/target/linux/ar7-2.6/files/arch/mips/ar7/prom.c b/target/linux/ar7-2.6/files/arch/mips/ar7/prom.c
index 99b528d..00cb4a6 100644 (file)
--- a/target/linux/ar7-2.6/files/arch/mips/ar7/prom.c
+++ b/target/linux/ar7-2.6/files/arch/mips/ar7/prom.c
@@ -29,6 +29,7 @@
 #include <asm/io.h>
 #include <asm/bootinfo.h>
 #include <asm/mips-boards/prom.h>
 #include <asm/io.h>
 #include <asm/bootinfo.h>
 #include <asm/mips-boards/prom.h>

+#include <asm/gdb-stub.h>

 
 #include <asm/ar7/ar7.h>
 
 
 #include <asm/ar7/ar7.h>
 


@@ -243,6 +244,13 @@ static void __init console_config(void)
        if (strstr(prom_getcmdline(), "console="))
                return;
 
        if (strstr(prom_getcmdline(), "console="))
                return;
 

+#ifdef CONFIG_KGDB
+       strcat(prom_getcmdline(), " console=kgdb");
+       prom_printf("Please connect GDB to this port\n");
+       kgdb_enabled = 1;
+       return;
+#endif
+

        if ((s = prom_getenv("modetty0"))) {
                baud = simple_strtoul(s, &p, 10);
                s = p;
        if ((s = prom_getenv("modetty0"))) {
                baud = simple_strtoul(s, &p, 10);
                s = p;


@@ -301,4 +309,16 @@ int prom_putchar(char c)
        return 1;
 }
 
        return 1;
 }
 

+#ifdef CONFIG_KGDB
+int putDebugChar(char c)
+{
+       return prom_putchar(c);
+}
+
+char getDebugChar(void)
+{
+       return prom_getchar();
+}
+#endif
+

 EXPORT_SYMBOL(prom_getenv);
 EXPORT_SYMBOL(prom_getenv);