From 3867e3d4cef25394cb0782c0e19e3adfca329d6f Mon Sep 17 00:00:00 2001
From: Andy Green <andy@openmoko.com>
Date: Mon, 1 Dec 2008 01:26:07 +0000
Subject: [PATCH] qi-gta01-02-03-always-tty0-console.patch

tty0 is the LCM... this patch changes the defaults so that the kernel
always treats tty0 as a console, but it also sets the loglevel so that
only KERN_ERR or worse will be printed there.  With matching changes
to the kernel, most of the noise at KERN_ERR is reduced to KERN_INFO,
so it gets the behviour the LCM by default is not cluttered with
messages unless they are important during boot.

Signed-off-by: Andy Green <andy@openmoko.com>
---
 qiboot/src/cpu/s3c2410/gta01.c               | 14 ++++++++------
 qiboot/src/cpu/s3c2442/gta02.c               |  7 ++++---
 qiboot/src/cpu/s3c6410/gta03-steppingstone.c |  6 ++++--
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/qiboot/src/cpu/s3c2410/gta01.c b/qiboot/src/cpu/s3c2410/gta01.c
index 1b572d2..db7d653 100644
--- a/qiboot/src/cpu/s3c2410/gta01.c
+++ b/qiboot/src/cpu/s3c2410/gta01.c
@@ -259,10 +259,12 @@ const struct board_api board_api_gta01 = {
 				 "0x00200000(kernel)," \
 				 "0x000a0000(splash)," \
 				 "0x03d1c000(rootfs) " \
+			       "loglevel=4 " \
+			       "console=tty0 "\
 			       "console=ttySAC0,115200 " \
 			       "init=/sbin/init "\
-			       "ro",
-	.commandline_board_debug = " loglevel=8 console=tty0",
+			       "ro ",
+	.commandline_board_debug = "loglevel=8 ",
 	.noboot = "boot/noboot-GTA01",
 	.append = "boot/append-GTA01",
 	/* these are the ways we could boot GTA01 in order to try */
@@ -274,7 +276,7 @@ const struct board_api board_api_gta01 = {
 			.partition_index = 1,
 			.filesystem = FS_EXT2,
 			.filepath = "boot/uImage-GTA01.bin",
-			.commandline_append = " root=/dev/mmcblk0p1 ",
+			.commandline_append = "root=/dev/mmcblk0p1 ",
 		},
 		[1] = {
 			.name = "SD Card EXT2 Kernel p2",
@@ -283,7 +285,7 @@ const struct board_api board_api_gta01 = {
 			.partition_index = 2,
 			.filesystem = FS_EXT2,
 			.filepath = "boot/uImage-GTA01.bin",
-			.commandline_append = " root=/dev/mmcblk0p2 ",
+			.commandline_append = "root=/dev/mmcblk0p2 ",
 		},
 		[2] = {
 			.name = "SD Card EXT2 Kernel p3",
@@ -292,14 +294,14 @@ const struct board_api board_api_gta01 = {
 			.partition_index = 3,
 			.filesystem = FS_EXT2,
 			.filepath = "boot/uImage-GTA01.bin",
-			.commandline_append = " root=/dev/mmcblk0p3 ",
+			.commandline_append = "root=/dev/mmcblk0p3 ",
 		},
 		[3] = {
 			.name = "NAND Kernel",
 			.block_read = nand_read_ll,
 			.offset_blocks512_if_no_partition = 0x44000 / 512,
 			.filesystem = FS_RAW,
-			.commandline_append = " rootfstype=jffs2 " \
+			.commandline_append = "rootfstype=jffs2 " \
 				       "root=/dev/mtdblock4 ",
 		},
 	},
diff --git a/qiboot/src/cpu/s3c2442/gta02.c b/qiboot/src/cpu/s3c2442/gta02.c
index 708e8a8..583f22e 100644
--- a/qiboot/src/cpu/s3c2442/gta02.c
+++ b/qiboot/src/cpu/s3c2442/gta02.c
@@ -455,11 +455,12 @@ const struct board_api board_api_gta02 = {
 				       "0x000a0000(extra)," \
 				       "0x00040000(identity)," \
 				       "0x0f6a0000(backuprootfs) " \
+				      "loglevel=4 " \
+				      "console=tty0 " \
 				      "console=ttySAC2,115200 " \
 				      "init=/sbin/init " \
-				      "ro",
-	.commandline_board_debug = " console=tty0 " \
-				   "loglevel=8",
+				      "ro ",
+	.commandline_board_debug =  "loglevel=8",
 	.noboot = "boot/noboot-GTA02",
 	.append = "boot/append-GTA02",
 	/* these are the ways we could boot GTA02 in the order to try */
diff --git a/qiboot/src/cpu/s3c6410/gta03-steppingstone.c b/qiboot/src/cpu/s3c6410/gta03-steppingstone.c
index 723b390..7e1bac6 100644
--- a/qiboot/src/cpu/s3c6410/gta03-steppingstone.c
+++ b/qiboot/src/cpu/s3c6410/gta03-steppingstone.c
@@ -85,9 +85,11 @@ const struct board_api board_api_gta03 = {
 	.noboot = "boot/noboot-GTA03",
 	.append = "boot/append-GTA03",
 	.get_ui_keys = get_ui_keys_gta03,
-	.commandline_board = "console=ttySAC3,115200 " \
+	.commandline_board = "console=tty0 " \
+			     "console=ttySAC3,115200 " \
 			     "init=/sbin/init " \
-			     "loglevel=8 ",
+			     "loglevel=8 " \
+			     "ro ",
 	.kernel_source = {
 		[0] = {
 			.name = "SD Card rootfs",