Module Name: src
Committed By: palle
Date: Fri Jun 17 21:38:09 UTC 2016
Modified Files:
src/sys/arch/sparc64/conf: GENERIC files.sparc64
Log Message:
sun4v: vbus and vrtc drivers - from OpenBSD
To generate a diff of this commit:
cvs rdiff -u -r1.189 -r1.190 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r1.149 -r1.150 src/sys/arch/sparc64/conf/files.sparc64
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/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.189 src/sys/arch/sparc64/conf/GENERIC:1.190
--- src/sys/arch/sparc64/conf/GENERIC:1.189 Thu May 26 10:38:07 2016
+++ src/sys/arch/sparc64/conf/GENERIC Fri Jun 17 21:38:09 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.189 2016/05/26 10:38:07 nakayama Exp $
+# $NetBSD: GENERIC,v 1.190 2016/06/17 21:38:09 palle Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/sparc64/conf/std.sparc64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.189 $"
+#ident "GENERIC-$Revision: 1.190 $"
maxusers 64
@@ -247,6 +247,7 @@ ebus* at mainbus0 # ebus devices
ebus* at pci? # ebus devices
# XXX 'puc's aren't really bridges, but there's no better place for them here
puc* at pci? dev ? function ? # PCI "universal" comm. cards
+vbus0 at mainbus0
#### Standard system devices -- all required for a given architecture
@@ -273,6 +274,9 @@ rtc* at ebus?
## Timer chip found on 4/300, sun4c, sun4m and (some) sun4u systems.
timer* at mainbus0 # sun4c
+# Virtual devices for sun4v systems.
+vrtc0 at vbus?
+
#### Serial port configuration
## Zilog 8530 serial chips. Each has two-channels.
Index: src/sys/arch/sparc64/conf/files.sparc64
diff -u src/sys/arch/sparc64/conf/files.sparc64:1.149 src/sys/arch/sparc64/conf/files.sparc64:1.150
--- src/sys/arch/sparc64/conf/files.sparc64:1.149 Tue Oct 6 16:40:36 2015
+++ src/sys/arch/sparc64/conf/files.sparc64 Fri Jun 17 21:38:09 2016
@@ -1,4 +1,4 @@
-# $NetBSD: files.sparc64,v 1.149 2015/10/06 16:40:36 martin Exp $
+# $NetBSD: files.sparc64,v 1.150 2016/06/17 21:38:09 palle Exp $
# @(#)files.sparc64 8.1 (Berkeley) 7/19/93
# sparc64-specific configuration info
@@ -69,6 +69,10 @@ file arch/sparc64/dev/ebus.c ebus
attach ebus at mainbus with ebus_mainbus
file arch/sparc64/dev/ebus_mainbus.c ebus_mainbus
+device vbus {}
+attach vbus at mainbus
+file arch/sparc64/dev/vbus.c vbus
+
device clock: mk48txx
attach clock at sbus with mkclock_sbus
attach clock at ebus with mkclock_ebus
@@ -312,3 +316,8 @@ include "arch/sparc64/conf/majors.sparc6
# OpenFirmware convenience stuff
file dev/ofw/ofw_subr.c
+
+# Virtual rtc
+device vrtc
+attach vrtc at vbus
+file arch/sparc64/dev/vrtc.c vrtc
