From 8ae36586eba14e3968856d84cdb3475b9c27ee8f Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier.adi@gmail.com>
Date: Fri, 10 Oct 2008 17:37:52 +0800
Subject: [PATCH] --- yaml --- r: 113778 b: refs/heads/master c:
 a88c71e4367aada2065c5e247477c891d2ca952f h: refs/heads/master v: v3

---
 [refs]                                    |  2 +-
 trunk/arch/blackfin/kernel/early_printk.c | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f11a0eea798a..532420ee4de8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c08f1d122627c9559fb03a11f52ea37f960b61e
+refs/heads/master: a88c71e4367aada2065c5e247477c891d2ca952f
diff --git a/trunk/arch/blackfin/kernel/early_printk.c b/trunk/arch/blackfin/kernel/early_printk.c
index 60f67f90fe35..1f4e3d2e0901 100644
--- a/trunk/arch/blackfin/kernel/early_printk.c
+++ b/trunk/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