Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / arch / blackfin / kernel / early_printk.c

diff --git a/arch/blackfin/kernel/early_printk.c b/arch/blackfin/kernel/early_printk.c
index 60f67f90fe35e7b81c2b349d2733c78c9ed16fd0..1f4e3d2e09014533cc929b53627ead66333030f4 100644 (file)
--- a/arch/blackfin/kernel/early_printk.c
+++ b/arch/blackfin/kernel/early_printk.c
@@ -35,6 +35,9 @@
 extern struct console *bfin_earlyserial_init(unsigned int port,
                                                unsigned int cflag);
 #endif
+#ifdef CONFIG_BFIN_JTAG_COMM
+extern struct console *bfin_jc_early_init(void);
+#endif
 
 static struct console *early_console;
 
@@ -142,6 +145,15 @@ int __init setup_early_printk(char *buf)
                early_console = earlyserial_init(buf);
        }
 #endif
+
+#ifdef CONFIG_BFIN_JTAG_COMM
+       /* Check for Blackfin JTAG */
+       if (!strncmp(buf, "jtag", 4)) {
+               buf += 4;
+               early_console = bfin_jc_early_init();
+       }
+#endif
+
 #ifdef CONFIG_FB
                /* TODO: add framebuffer console support */
 #endif