2 files changed, 162 insertions, 0 deletions
diff --git a/arch/blackfin/kernel/Makefile b/arch/blackfin/kernel/Makefile
index 243883ec6de1..8aeb6066b19b 100644
--- a/arch/blackfin/kernel/Makefile
+++ b/arch/blackfin/kernel/Makefile
@@ -13,3 +13,4 @@ obj-$(CONFIG_MODULES)                += module.o
 obj-$(CONFIG_BFIN_DMA_5XX)           += bfin_dma_5xx.o
 obj-$(CONFIG_DUAL_CORE_TEST_MODULE)  += dualcore_test.o
 obj-$(CONFIG_KGDB)                   += kgdb.o
+obj-$(CONFIG_EARLY_PRINTK)           += early_printk.o
diff --git a/arch/blackfin/kernel/early_printk.c b/arch/blackfin/kernel/early_printk.c
new file mode 100644
index 000000000000..9bf61706694f
--- /dev/null
+++ b/arch/blackfin/kernel/early_printk.c
@@ -0,0 +1,161 @@
+/*
+ * File:         arch/blackfin/kernel/early_printk.c
+ * Based on:     arch/x86_64/kernel/early_printk.c
+ * Author:       Robin Getz <rgetz@blackfin.uclinux.org
+ *
+ * Created:      14Aug2007
+ * Description:  allow a console to be used for early printk
+ *
+ * Modified:
+ *               Copyright 2004-2007 Analog Devices Inc.
+ *
+ * Bugs:         Enter bugs at http://blackfin.uclinux.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/serial_core.h>
+#include <linux/console.h>
+#include <linux/string.h>
+#include <asm/blackfin.h>
+#include <asm/irq_handler.h>
+#include <asm/early_printk.h>
+#ifdef CONFIG_SERIAL_BFIN
+extern struct console *bfin_earlyserial_init(unsigned int port,
+                                                unsigned int cflag);
+#endif
+static struct console *early_console;
+/* Default console
+ * Port n == ttyBFn
+ * cflags == UART output modes
+ */
+#define DEFAULT_PORT 0
+#define DEFAULT_CFLAG CS8|B57600
+#ifdef CONFIG_SERIAL_CORE
+/* What should get here is "0,57600" */
+static struct console * __init earlyserial_init(char *buf)
+{
+        int baud, bit;
+        char parity;
+        unsigned int serial_port = DEFAULT_PORT;
+        unsigned int cflag = DEFAULT_CFLAG;
+        serial_port = simple_strtoul(buf, &buf, 10);
+        buf++;
+        cflag = 0;
+        baud = simple_strtoul(buf, &buf, 10);
+        switch (baud) {
+        case 1200:
+                cflag |= B1200;
+                break;
+        case 2400:
+                cflag |= B2400;
+                break;
+        case 4800:
+                cflag |= B4800;
+                break;
+        case 9600:
+                cflag |= B9600;
+                break;
+        case 19200:
+                cflag |= B19200;
+                break;
+        case 38400:
+                cflag |= B38400;
+                break;
+        case 115200:
+                cflag |= B115200;
+                break;
+        default:
+                cflag |= B57600;
+        }
+        parity = buf[0];
+        buf++;
+        switch (parity) {
+        case 'e':
+                cflag |= PARENB;
+                break;
+        case 'o':
+                cflag |= PARODD;
+                break;
+        }
+        bit = simple_strtoul(buf, &buf, 10);
+        switch (bit) {
+        case 5:
+                cflag |= CS5;
+                break;
+        case 6:
+                cflag |= CS5;
+                break;
+        case 7:
+                cflag |= CS5;
+                break;
+        default:
+                cflag |= CS8;
+        }
+#ifdef CONFIG_SERIAL_BFIN
+        return bfin_earlyserial_init(serial_port, cflag);
+#else
+        return NULL;
+#endif
+}
+#endif
+int __init setup_early_printk(char *buf)
+{
+        /* Crashing in here would be really bad, so check both the var
+           and the pointer before we start using it
+         */
+        if (!buf)
+                return 0;
+        if (!*buf)
+                return 0;
+        if (early_console != NULL)
+                return 0;
+#ifdef CONFIG_SERIAL_BFIN
+        /* Check for Blackfin Serial */
+        if (!strncmp(buf, "serial,uart", 11)) {
+                buf += 11;
+                early_console = earlyserial_init(buf);
+        }
+#endif
+#ifdef CONFIG_FB
+                /* TODO: add framebuffer console support */
+#endif
+        if (likely(early_console)) {
+                early_console->flags |= CON_BOOT;
+                register_console(early_console);
+                printk(KERN_INFO "early printk enabled on %s%d\n",
+                        early_console->name,
+                        early_console->index);
+        }
+        return 0;
+}
+early_param("earlyprintk", setup_early_printk);

diff --git a/arch/blackfin/kernel/Makefile b/arch/blackfin/kernel/Makefile index 243883ec6de1..8aeb6066b19b 100644 --- a/arch/blackfin/kernel/Makefile +++ b/arch/blackfin/kernel/Makefile
@@ -13,3 +13,4 @@ obj-$(CONFIG_MODULES) += module.o
13	obj-$(CONFIG_BFIN_DMA_5XX) += bfin_dma_5xx.o	13	obj-$(CONFIG_BFIN_DMA_5XX) += bfin_dma_5xx.o
14	obj-$(CONFIG_DUAL_CORE_TEST_MODULE) += dualcore_test.o	14	obj-$(CONFIG_DUAL_CORE_TEST_MODULE) += dualcore_test.o
15	obj-$(CONFIG_KGDB) += kgdb.o	15	obj-$(CONFIG_KGDB) += kgdb.o
		16	obj-$(CONFIG_EARLY_PRINTK) += early_printk.o


diff --git a/arch/blackfin/kernel/early_printk.c b/arch/blackfin/kernel/early_printk.c new file mode 100644 index 000000000000..9bf61706694f --- /dev/null +++ b/arch/blackfin/kernel/early_printk.c
@@ -0,0 +1,161 @@
		1	/*
		2	* File: arch/blackfin/kernel/early_printk.c
		3	* Based on: arch/x86_64/kernel/early_printk.c
		4	* Author: Robin Getz <rgetz@blackfin.uclinux.org
		5	*
		6	* Created: 14Aug2007
		7	* Description: allow a console to be used for early printk
		8	*
		9	* Modified:
		10	* Copyright 2004-2007 Analog Devices Inc.
		11	*
		12	* Bugs: Enter bugs at http://blackfin.uclinux.org/
		13	*
		14	* This program is free software; you can redistribute it and/or modify
		15	* it under the terms of the GNU General Public License as published by
		16	* the Free Software Foundation; either version 2 of the License, or
		17	* (at your option) any later version.
		18	*
		19	* This program is distributed in the hope that it will be useful,
		20	* but WITHOUT ANY WARRANTY; without even the implied warranty of
		21	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		22	* GNU General Public License for more details.
		23	*/
		24
		25	#include <linux/kernel.h>
		26	#include <linux/init.h>
		27	#include <linux/serial_core.h>
		28	#include <linux/console.h>
		29	#include <linux/string.h>
		30	#include <asm/blackfin.h>
		31	#include <asm/irq_handler.h>
		32	#include <asm/early_printk.h>
		33
		34	#ifdef CONFIG_SERIAL_BFIN
		35	extern struct console *bfin_earlyserial_init(unsigned int port,
		36	unsigned int cflag);
		37	#endif
		38
		39	static struct console *early_console;
		40
		41	/* Default console
		42	* Port n == ttyBFn
		43	* cflags == UART output modes
		44	*/
		45	#define DEFAULT_PORT 0
		46	#define DEFAULT_CFLAG CS8\|B57600
		47
		48	#ifdef CONFIG_SERIAL_CORE
		49	/* What should get here is "0,57600" */
		50	static struct console * __init earlyserial_init(char *buf)
		51	{
		52	int baud, bit;
		53	char parity;
		54	unsigned int serial_port = DEFAULT_PORT;
		55	unsigned int cflag = DEFAULT_CFLAG;
		56
		57	serial_port = simple_strtoul(buf, &buf, 10);
		58	buf++;
		59
		60	cflag = 0;
		61	baud = simple_strtoul(buf, &buf, 10);
		62	switch (baud) {
		63	case 1200:
		64	cflag \|= B1200;
		65	break;
		66	case 2400:
		67	cflag \|= B2400;
		68	break;
		69	case 4800:
		70	cflag \|= B4800;
		71	break;
		72	case 9600:
		73	cflag \|= B9600;
		74	break;
		75	case 19200:
		76	cflag \|= B19200;
		77	break;
		78	case 38400:
		79	cflag \|= B38400;
		80	break;
		81	case 115200:
		82	cflag \|= B115200;
		83	break;
		84	default:
		85	cflag \|= B57600;
		86	}
		87
		88	parity = buf[0];
		89	buf++;
		90	switch (parity) {
		91	case 'e':
		92	cflag \|= PARENB;
		93	break;
		94	case 'o':
		95	cflag \|= PARODD;
		96	break;
		97	}
		98
		99	bit = simple_strtoul(buf, &buf, 10);
		100	switch (bit) {
		101	case 5:
		102	cflag \|= CS5;
		103	break;
		104	case 6:
		105	cflag \|= CS5;
		106	break;
		107	case 7:
		108	cflag \|= CS5;
		109	break;
		110	default:
		111	cflag \|= CS8;
		112	}
		113
		114	#ifdef CONFIG_SERIAL_BFIN
		115	return bfin_earlyserial_init(serial_port, cflag);
		116	#else
		117	return NULL;
		118	#endif
		119
		120	}
		121	#endif
		122
		123	int __init setup_early_printk(char *buf)
		124	{
		125
		126	/* Crashing in here would be really bad, so check both the var
		127	and the pointer before we start using it
		128	*/
		129	if (!buf)
		130	return 0;
		131
		132	if (!*buf)
		133	return 0;
		134
		135	if (early_console != NULL)
		136	return 0;
		137
		138	#ifdef CONFIG_SERIAL_BFIN
		139	/* Check for Blackfin Serial */
		140	if (!strncmp(buf, "serial,uart", 11)) {
		141	buf += 11;
		142	early_console = earlyserial_init(buf);
		143	}
		144	#endif
		145	#ifdef CONFIG_FB
		146	/* TODO: add framebuffer console support */
		147	#endif
		148
		149	if (likely(early_console)) {
		150	early_console->flags \|= CON_BOOT;
		151
		152	register_console(early_console);
		153	printk(KERN_INFO "early printk enabled on %s%d\n",
		154	early_console->name,
		155	early_console->index);
		156	}
		157
		158	return 0;
		159	}
		160
		161	early_param("earlyprintk", setup_early_printk);