[src/trunk]: src/sys/arch/zaurus support FFUARTCONSOLE.

[nonaka <nonaka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b5a6235b0bc7
branches:  trunk
changeset: 762012:b5a6235b0bc7
user:      nonaka <nonaka%NetBSD.org@localhost>
date:      Sun Feb 13 05:36:34 2011 +0000

description:
support FFUARTCONSOLE.

diffstat:

 sys/arch/zaurus/conf/GENERIC     |   3 ++-
 sys/arch/zaurus/zaurus/machdep.c |  11 ++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diffs (49 lines):

diff -r cc0b71e8f2ce -r b5a6235b0bc7 sys/arch/zaurus/conf/GENERIC
--- a/sys/arch/zaurus/conf/GENERIC      Sun Feb 13 05:12:55 2011 +0000
+++ b/sys/arch/zaurus/conf/GENERIC      Sun Feb 13 05:36:34 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: GENERIC,v 1.31 2010/11/23 11:14:07 hannken Exp $
+#      $NetBSD: GENERIC,v 1.32 2011/02/13 05:36:34 nonaka Exp $
 #
 # GENERIC machine description file
 #
@@ -215,6 +215,7 @@
 
 # integrated 16550 UARTs
 options        COM_PXA2X0
+#options       FFUARTCONSOLE
 com0 at pxaip?  addr 0x40100000 intr 22        # Full Function UART
 com1 at pxaip?  addr 0x40200000 intr 21        # Bluetooth UART
 com2 at pxaip?  addr 0x40700000 intr 20        # Standard UART (for IrDA)
diff -r cc0b71e8f2ce -r b5a6235b0bc7 sys/arch/zaurus/zaurus/machdep.c
--- a/sys/arch/zaurus/zaurus/machdep.c  Sun Feb 13 05:12:55 2011 +0000
+++ b/sys/arch/zaurus/zaurus/machdep.c  Sun Feb 13 05:36:34 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.21 2010/11/28 08:23:25 hannken Exp $     */
+/*     $NetBSD: machdep.c,v 1.22 2011/02/13 05:36:34 nonaka Exp $      */
 /*     $OpenBSD: zaurus_machdep.c,v 1.25 2006/06/20 18:24:04 todd Exp $        */
 
 /*
@@ -107,7 +107,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.21 2010/11/28 08:23:25 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.22 2011/02/13 05:36:34 nonaka Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -242,7 +242,12 @@
 
 pv_addr_t kernel_pt_table[NUM_KERNEL_PTS];
 
-const char *console = "glass";
+const char *console =
+#ifdef FFUARTCONSOLE
+       "ffuart";
+#else
+       "glass";
+#endif
 int glass_console = 0;
 
 #ifdef KLOADER