Module Name: src
Committed By: skrll
Date: Thu Oct 2 09:03:43 UTC 2014
Modified Files:
src/sys/arch/arm/samsung: sscom.c
src/sys/arch/evbarm/conf: ODROID-XU
Log Message:
Fix reinoud-ification.
My odroid-xu has console again.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/samsung/sscom.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/ODROID-XU
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/samsung/sscom.c
diff -u src/sys/arch/arm/samsung/sscom.c:1.6 src/sys/arch/arm/samsung/sscom.c:1.7
--- src/sys/arch/arm/samsung/sscom.c:1.6 Sun Aug 10 16:44:33 2014
+++ src/sys/arch/arm/samsung/sscom.c Thu Oct 2 09:03:43 2014
@@ -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 int sscom_to_tiocm(struct sscom_s
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 @@ sscomintr(void *v)
}
-#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 @@ sscom_init(bus_space_tag_t iot, bus_spac
#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
*/
Index: src/sys/arch/evbarm/conf/ODROID-XU
diff -u src/sys/arch/evbarm/conf/ODROID-XU:1.2 src/sys/arch/evbarm/conf/ODROID-XU:1.3
--- src/sys/arch/evbarm/conf/ODROID-XU:1.2 Fri Sep 26 16:30:32 2014
+++ src/sys/arch/evbarm/conf/ODROID-XU Thu Oct 2 09:03:43 2014
@@ -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 @@ iic* at exyoiic?
# serial console connectivity
-options SSCOM0CONSOLE, CONSPEED=115200
+options SSCOM2CONSOLE, CONSPEED=115200
# include all USB devices
include "dev/usb/usbdevices.config"
