[src/trunk]: src/sys/arch Fix reinoud-ification.

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

details:   https://anonhg.NetBSD.org/src/rev/e74a559131c8
branches:  trunk
changeset: 332646:e74a559131c8
user:      skrll <skrll%NetBSD.org@localhost>
date:      Thu Oct 02 09:03:43 2014 +0000

description:
Fix reinoud-ification.

My odroid-xu has console again.

diffstat:

 sys/arch/arm/samsung/sscom.c   |  16 +++++++++++-----
 sys/arch/evbarm/conf/ODROID-XU |   4 ++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diffs (70 lines):

diff -r 05fdf4df5c61 -r e74a559131c8 sys/arch/arm/samsung/sscom.c
--- a/sys/arch/arm/samsung/sscom.c      Thu Oct 02 06:56:36 2014 +0000
+++ b/sys/arch/arm/samsung/sscom.c      Thu Oct 02 09:03:43 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sscom.c,v 1.6 2014/08/10 16:44:33 tls Exp $ */
+/*     $NetBSD: sscom.c,v 1.7 2014/10/02 09:03:43 skrll Exp $ */
 
 /*
  * Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -98,7 +98,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sscom.c,v 1.6 2014/08/10 16:44:33 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sscom.c,v 1.7 2014/10/02 09:03:43 skrll Exp $");
 
 #include "opt_sscom.h"
 #include "opt_ddb.h"
@@ -180,7 +180,9 @@
 static void    sscom_iflush(struct sscom_softc *);
 
 static int     sscomhwiflow(struct tty *tp, int block);
-#if defined(KGDB) || defined(SSCOM0CONSOLE) || defined(SSCOM1CONSOLE)
+#if defined(KGDB) || \
+    defined(SSCOM0CONSOLE) || defined(SSCOM1CONSOLE) || \
+    defined(SSCOM2CONSOLE) || defined(SSCOM3CONSOLE)
 static int     sscom_init(bus_space_tag_t, bus_space_handle_t,
                    const struct sscom_uart_info *,
                    int, int, tcflag_t, bus_space_handle_t *);
@@ -1835,7 +1837,9 @@
 }
 
 
-#if defined(KGDB) || defined(SSCOM0CONSOLE) || defined(SSCOM1CONSOLE)
+#if defined(KGDB) || \
+    defined(SSCOM0CONSOLE) || defined(SSCOM1CONSOLE) || \
+    defined(SSCOM2CONSOLE) || defined(SSCOM3CONSOLE)
 /*
  * Initialize UART for use as console or KGDB line.
  */
@@ -1881,7 +1885,9 @@
 
 #endif
 
-#if defined(SSCOM0CONSOLE) || defined(SSCOM1CONSOLE)
+#if \
+    defined(SSCOM0CONSOLE) || defined(SSCOM1CONSOLE) || \
+    defined(SSCOM2CONSOLE) || defined(SSCOM3CONSOLE)
 /*
  * Following are all routines needed for SSCOM to act as console
  */
diff -r 05fdf4df5c61 -r e74a559131c8 sys/arch/evbarm/conf/ODROID-XU
--- a/sys/arch/evbarm/conf/ODROID-XU    Thu Oct 02 06:56:36 2014 +0000
+++ b/sys/arch/evbarm/conf/ODROID-XU    Thu Oct 02 09:03:43 2014 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: ODROID-XU,v 1.2 2014/09/26 16:30:32 reinoud Exp $
+#      $NetBSD: ODROID-XU,v 1.3 2014/10/02 09:03:43 skrll Exp $
 #
 #      ODROID-XU -- ODROID-XU Exynos5410 based kernel
 #
@@ -219,7 +219,7 @@
 
 
 # serial console connectivity
-options                SSCOM0CONSOLE, CONSPEED=115200
+options                SSCOM2CONSOLE, CONSPEED=115200
 
 # include all USB devices
 include "dev/usb/usbdevices.config"