Subject: [PATCH] Fix serial console detection

From: Kaj-Michael Lang <[email-masked]>
Date: Mon, 14 Feb 2005 16:08:24 +0000 (Local time zone must be set--see zic manual page)

In ip22-setup.c the checks for serial/graphics console logic does
not check if ARCS console=g but the machine is using serial console, as
it does if no keyboard is attached.

This patch adds a check if ConsoleOut is serial. There might also be 
support for other graphics than Newport soon...

Index: arch/mips/sgi-ip22/ip22-setup.c
===================================================================
RCS file: /home/cvs/linux/arch/mips/sgi-ip22/ip22-setup.c,v
retrieving revision 1.44
diff -u -r1.44 ip22-setup.c
--- arch/mips/sgi-ip22/ip22-setup.c	10 Dec 2004 13:31:42 -0000	1.44
+++ arch/mips/sgi-ip22/ip22-setup.c	14 Feb 2005 13:57:33 -0000
@@ -56,6 +56,7 @@
  static int __init ip22_setup(void)
  {
  	char *ctype;
+	char *cserial;

  	board_be_init = ip22_be_init;
  	ip22_time_init();
@@ -81,9 +82,14 @@
  	/* ARCS console environment variable is set to "g?" for
  	 * graphics console, it is set to "d" for the first serial
  	 * line and "d2" for the second serial line.
+	 *
+	 * Need to check if the case is 'g' but no keyboard:
+	 * (ConsoleIn/Out = serial )
  	 */
  	ctype = ArcGetEnvironmentVariable("console");
-	if (ctype && *ctype == 'd') {
+	cserial = ArcGetEnvironmentVariable("ConsoleOut");
+
+	if ( (ctype && *ctype == 'd') || (cserial && *cserial == 's')) {
  		static char options[8];
  		char *baud = ArcGetEnvironmentVariable("dbaud");
  		if (baud)
@@ -91,7 +97,7 @@
  		add_preferred_console("ttyS", *(ctype + 1) == '2' ? 1 : 0,
  				      baud ? options : NULL);
  	} else if (!ctype || *ctype != 'g') {
-		/* Use ARC if we don't want serial ('d') or Newport ('g'). */
+		/* Use ARC if we don't want serial ('d') or Graphics ('g'). */
  		prom_flags |= PROM_FLAG_USE_AS_CONSOLE;
  		add_preferred_console("arc", 0, NULL);
  	}

-- 
Kaj-Michael Lang, Turku, Finland
[email-masked] http://www.tal.org/