CVS commit: src/sys/arch/sparc/conf
Module Name:src Committed By: mrg Date: Sun Apr 12 06:05:34 UTC 2020 Modified Files: src/sys/arch/sparc/conf: INSTALL Log Message: base INSTALL kernel upon GENERIC with many "no ...". To generate a diff of this commit: cvs rdiff -u -r1.103 -r1.104 src/sys/arch/sparc/conf/INSTALL 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/sparc/conf/INSTALL diff -u src/sys/arch/sparc/conf/INSTALL:1.103 src/sys/arch/sparc/conf/INSTALL:1.104 --- src/sys/arch/sparc/conf/INSTALL:1.103 Sun Jan 19 01:25:07 2020 +++ src/sys/arch/sparc/conf/INSTALL Sun Apr 12 06:05:34 2020 @@ -1,18 +1,13 @@ -# $NetBSD: INSTALL,v 1.103 2020/01/19 01:25:07 thorpej Exp $ +# $NetBSD: INSTALL,v 1.104 2020/04/12 06:05:34 mrg Exp $ # # from: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp # -# floppy install kernel. try to keep this in sync with GENERIC but -# leave as much disabled as possible. +# floppy install kernel. based upon GENERIC, with much turned off. -include "arch/sparc/conf/std.sparc" - -#options INCLUDE_CONFIG_FILE # embed config file in kernel binary +include "arch/sparc/conf/GENERIC" makeoptions COPTS="-Os" # Optimise for space. Implies -O2 -maxusers 32 - # Enable the hooks used for initializing the root memory-disk. options MEMORY_DISK_HOOKS options MEMORY_DISK_IS_ROOT # force root on memory disk @@ -24,546 +19,79 @@ options MEMORY_DISK_RBFLAGS=RB_SINGLE # pseudo-device md # memory disk device (ramdisk) -## System kernel configuration. See options(4) for more detail. - - -# Options for variants of the Sun SPARC architecure. -# We currently support three architecture types; at least one is required. -options SUN4 # sun4/100, sun4/200, sun4/300 -options SUN4C # sun4c - SS1, 1+, 2, ELC, SLC, IPC, IPX, etc. -options SUN4M # sun4m - SS10, SS20, Classic, etc. - -options SUN4_MMU3L # 3-level MMU on sun4/400 - -## System options specific to the sparc machine type - -# Blink the power LED on some machines to indicate the system load. -#options BLINK - -# wscons stuff -#options WSEMUL_SUN -options WSEMUL_VT100 +no options SUN4D options WSDISPLAY_DEFAULTSCREENS=1 -#options WSDISPLAY_COMPAT_USL # wsconscfg VT handling -options WSDISPLAY_COMPAT_RAWKBD -options WSDISPLAY_CUSTOM_OUTPUT -options WS_DEFAULT_FG=WSCOL_BLACK -options WS_DEFAULT_BG=WSCOL_LIGHT_WHITE -options WS_KERNEL_FG=WSCOL_GREEN -options WS_KERNEL_BG=WSCOL_LIGHT_WHITE -options FONT_GALLANT12x22 # the console font -options FONT_BOLD8x16 # a somewhat smaller font - - System options that are the same for all ports - -## Root device configuration: change the ?'s if you are going to use a -## nonstandard root partition (other than where the kernel is booted from) -## and/or nonstandard root type (not ffs or nfs). Normally this can be -## automagically determined at boot time. - -config netbsd root on ? type ? - -## System call tracing (see ktrace(1)). -#options KTRACE - -## System V compatible IPC subsystem. (msgctl(2), semctl(2), and shmctl(2)) -#options SYSVMSG # System V message queues -#options SYSVSEM # System V semaphores -#options SYSVSHM # System V shared memory - -options USERCONF # userconf(4) support -options PIPE_SOCKETPAIR # smaller, but slower pipe(2) -#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel - -## NFS boot options; tries DHCP/BOOTP then BOOTPARAM -options NFS_BOOT_BOOTPARAM -#options NFS_BOOT_BOOTP -options NFS_BOOT_DHCP - - Debugging options - -## The DDB in-kernel debugger runs at panic (unless DDB_ONPANIC=0), or at -## serial console break or keyboard reset, where the PROM would normally -## intercept. DDB_HISTORY_SIZE adds up/down arrow command history. -#options DDB # kernel dynamic debugger -#options DDB_HISTORY_SIZE=100 # enable history editing in DDB -#options DDB_ONPANIC=1 # see also sysctl(7): `ddb.onpanic' - -## You may also use gdb, on another computer connected to this machine over -## a serial port. Both KGDB_DEV and KGDB_DEVRATE should be specified; -## KGDB_DEV is a dev_t encoded device number of the serial port to use. -## (0xc01 = ttya, 0xc02 = ttyb.) -#options KGDB # support for kernel gdb -#options KGDB_DEV=0xc01 # kgdb device number (this is `ttyb') -#options KGDB_DEVRATE=38400 # baud rate - - -## Compile the kernel with debugging symbols (`netbsd.gdb' is the debug file), -## such that gdb(1) can be used on a kernel coredump. - -#makeoptions DEBUG="-g" - - -## Adds code to the kernel that does internal consistency checks, and will -## cause the kernel to panic if corruption of internal data structures -## is detected. -#options DIAGNOSTIC # extra kernel sanity checking - -## Enable (possibly expensive) debugging code that may also display messages -## on the system console -#options DEBUG - -#options MIIVERBOSE # verbose PHY autoconfig messages - -## Make SCSI error messages more verbose when
CVS commit: src/sys/arch/sparc/conf
Module Name:src
Committed By: macallan
Date: Fri Mar 1 02:28:27 UTC 2019
Modified Files:
src/sys/arch/sparc/conf: files.sparc
Log Message:
defflag SX_DEBUG
To generate a diff of this commit:
cvs rdiff -u -r1.158 -r1.159 src/sys/arch/sparc/conf/files.sparc
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/sparc/conf/files.sparc
diff -u src/sys/arch/sparc/conf/files.sparc:1.158 src/sys/arch/sparc/conf/files.sparc:1.159
--- src/sys/arch/sparc/conf/files.sparc:1.158 Wed Dec 19 13:57:49 2018
+++ src/sys/arch/sparc/conf/files.sparc Fri Mar 1 02:28:27 2019
@@ -1,4 +1,4 @@
-# $NetBSD: files.sparc,v 1.158 2018/12/19 13:57:49 maxv Exp $
+# $NetBSD: files.sparc,v 1.159 2019/03/01 02:28:27 macallan Exp $
# @(#)files.sparc 8.1 (Berkeley) 7/19/93
# sparc-specific configuration info
@@ -122,6 +122,7 @@ file arch/sparc/sparc/memecc.c eccmemct
device sx {}
attach sx at mainbus
file arch/sparc/dev/sx.c sx needs-flag
+defflag opt_sx.h SX_DEBUG
device tctrl: sysmon_envsys, sysmon_power, sysmon_taskq
attach tctrl at obio
CVS commit: src/sys/arch/sparc/conf
Module Name:src Committed By: mrg Date: Tue Feb 12 07:15:58 UTC 2019 Modified Files: src/sys/arch/sparc/conf: GENERIC Log Message: add commented QUOTA2 line. To generate a diff of this commit: cvs rdiff -u -r1.263 -r1.264 src/sys/arch/sparc/conf/GENERIC 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/sparc/conf/GENERIC diff -u src/sys/arch/sparc/conf/GENERIC:1.263 src/sys/arch/sparc/conf/GENERIC:1.264 --- src/sys/arch/sparc/conf/GENERIC:1.263 Mon Jan 14 00:13:18 2019 +++ src/sys/arch/sparc/conf/GENERIC Tue Feb 12 07:15:58 2019 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.263 2019/01/14 00:13:18 mrg Exp $ +# $NetBSD: GENERIC,v 1.264 2019/02/12 07:15:58 mrg Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/sparc/conf/std.sparc" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.263 $" +#ident "GENERIC-$Revision: 1.264 $" maxusers 32 @@ -182,6 +182,7 @@ file-system TMPFS # Efficient memory fi ## File system options. options NFSSERVER # Sun NFS-compatible filesystem server options QUOTA # FFS quotas +#options QUOTA2 # new, in-filesystem UFS quotas #options FFS_EI # FFS Endian Independent support options WAPBL # File system journaling support #options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
CVS commit: src/sys/arch/sparc/conf
Module Name:src Committed By: mrg Date: Mon Jan 14 00:13:18 UTC 2019 Modified Files: src/sys/arch/sparc/conf: GENERIC KRUPS Log Message: normalise comment for fileassoc(8). from PR#44873. To generate a diff of this commit: cvs rdiff -u -r1.262 -r1.263 src/sys/arch/sparc/conf/GENERIC cvs rdiff -u -r1.78 -r1.79 src/sys/arch/sparc/conf/KRUPS 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/sparc/conf/GENERIC diff -u src/sys/arch/sparc/conf/GENERIC:1.262 src/sys/arch/sparc/conf/GENERIC:1.263 --- src/sys/arch/sparc/conf/GENERIC:1.262 Wed Dec 19 13:57:49 2018 +++ src/sys/arch/sparc/conf/GENERIC Mon Jan 14 00:13:18 2019 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.262 2018/12/19 13:57:49 maxv Exp $ +# $NetBSD: GENERIC,v 1.263 2019/01/14 00:13:18 mrg Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/sparc/conf/std.sparc" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.262 $" +#ident "GENERIC-$Revision: 1.263 $" maxusers 32 @@ -712,7 +712,7 @@ pseudo-device wsmux # mouse and keyboa pseudo-device wsfont pseudo-device putter # for puffs and pud -#options FILEASSOC # fileassoc(9) +#options FILEASSOC # fileassoc(9) - required for Veriexec # and PAX_SEGVGUARD # Veriexec Index: src/sys/arch/sparc/conf/KRUPS diff -u src/sys/arch/sparc/conf/KRUPS:1.78 src/sys/arch/sparc/conf/KRUPS:1.79 --- src/sys/arch/sparc/conf/KRUPS:1.78 Wed Dec 19 13:57:49 2018 +++ src/sys/arch/sparc/conf/KRUPS Mon Jan 14 00:13:18 2019 @@ -1,4 +1,4 @@ -# $NetBSD: KRUPS,v 1.78 2018/12/19 13:57:49 maxv Exp $ +# $NetBSD: KRUPS,v 1.79 2019/01/14 00:13:18 mrg Exp $ # From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp # # Krups (JavaStation-NC) machine description file @@ -8,7 +8,7 @@ include "arch/sparc/conf/std.sparc" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "KRUPS-$Revision: 1.78 $" +#ident "KRUPS-$Revision: 1.79 $" maxusers 32 @@ -339,7 +339,7 @@ pseudo-device putter # for puffs and p #pseudo-device fss # file system snapshot device -#options FILEASSOC # fileassoc(9) +#options FILEASSOC # fileassoc(9) - required for Veriexec # and PAX_SEGVGUARD # Veriexec
CVS commit: src/sys/arch/sparc/conf
Module Name:src Committed By: martin Date: Mon Jan 15 09:48:28 UTC 2018 Modified Files: src/sys/arch/sparc/conf: GENERIC Log Message: Enable DIAGNOSTIC To generate a diff of this commit: cvs rdiff -u -r1.256 -r1.257 src/sys/arch/sparc/conf/GENERIC 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/sparc/conf/GENERIC diff -u src/sys/arch/sparc/conf/GENERIC:1.256 src/sys/arch/sparc/conf/GENERIC:1.257 --- src/sys/arch/sparc/conf/GENERIC:1.256 Thu Sep 14 07:58:43 2017 +++ src/sys/arch/sparc/conf/GENERIC Mon Jan 15 09:48:28 2018 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.256 2017/09/14 07:58:43 mrg Exp $ +# $NetBSD: GENERIC,v 1.257 2018/01/15 09:48:28 martin Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/sparc/conf/std.sparc" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.256 $" +#ident "GENERIC-$Revision: 1.257 $" maxusers 32 @@ -125,7 +125,7 @@ options DDB_HISTORY_SIZE=100 # enable h ## Adds code to the kernel that does internal consistency checks, and will ## cause the kernel to panic if corruption of internal data structures ## is detected. -#options DIAGNOSTIC # extra kernel sanity checking +options DIAGNOSTIC # extra kernel sanity checking ## Enable (possibly expensive) debugging code that may also display messages ## on the system console
CVS commit: src/sys/arch/sparc/conf
Module Name:src Committed By: mrg Date: Sat Dec 10 09:44:06 UTC 2016 Modified Files: src/sys/arch/sparc/conf: GENERIC Log Message: revert the previous. sparc has no spkr. To generate a diff of this commit: cvs rdiff -u -r1.252 -r1.253 src/sys/arch/sparc/conf/GENERIC 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/sparc/conf/GENERIC diff -u src/sys/arch/sparc/conf/GENERIC:1.252 src/sys/arch/sparc/conf/GENERIC:1.253 --- src/sys/arch/sparc/conf/GENERIC:1.252 Thu Dec 8 11:31:12 2016 +++ src/sys/arch/sparc/conf/GENERIC Sat Dec 10 09:44:06 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.252 2016/12/08 11:31:12 nat Exp $ +# $NetBSD: GENERIC,v 1.253 2016/12/10 09:44:06 mrg Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/sparc/conf/std.sparc" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.252 $" +#ident "GENERIC-$Revision: 1.253 $" maxusers 32 @@ -639,9 +639,6 @@ dbri* at sbus? slot ? offset ? # SUNW, audio* at audiobus? -options VAUDIOSPEAKER -spkr0 at audio0 # PC speaker (synthesized) - ## Sun "bwtwo" black and white framebuffer, found on sun4, sun4c, and sun4m ## systems. If your sun4 system has a cgfour installed in the P4 slot, ## the P4 entries for "bwtwo" will attach to the overlay plane of the
CVS commit: src/sys/arch/sparc/conf
Module Name:src
Committed By: christos
Date: Sat Dec 3 16:00:10 UTC 2016
Modified Files:
src/sys/arch/sparc/conf: Makefile.sparc
Log Message:
struct cpu_info is varible size when page_size is not fixed.
To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/sys/arch/sparc/conf/Makefile.sparc
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/sparc/conf/Makefile.sparc
diff -u src/sys/arch/sparc/conf/Makefile.sparc:1.94 src/sys/arch/sparc/conf/Makefile.sparc:1.95
--- src/sys/arch/sparc/conf/Makefile.sparc:1.94 Sat Feb 27 14:26:13 2016
+++ src/sys/arch/sparc/conf/Makefile.sparc Sat Dec 3 11:00:10 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sparc,v 1.94 2016/02/27 19:26:13 joerg Exp $
+# $NetBSD: Makefile.sparc,v 1.95 2016/12/03 16:00:10 christos Exp $
# Makefile for NetBSD
#
@@ -39,6 +39,7 @@ CFLAGS+= ${${ACTIVE_CC} == "clang":? -Qu
AFLAGS+= -x assembler-with-cpp
AFLAGS+= -Wa,-Av8
AFLAGS+= ${${ACTIVE_CC} == "clang":? -Qunused-arguments :}
+COPTS.kern_timeout.c += -Wno-stack-protector
##
## (3) libkern and compat
CVS commit: src/sys/arch/sparc/conf
Module Name:src Committed By: macallan Date: Sat Apr 30 05:24:45 UTC 2016 Modified Files: src/sys/arch/sparc/conf: files.sparc Log Message: cgfourteen needs glyphcache now To generate a diff of this commit: cvs rdiff -u -r1.155 -r1.156 src/sys/arch/sparc/conf/files.sparc 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/sparc/conf/files.sparc diff -u src/sys/arch/sparc/conf/files.sparc:1.155 src/sys/arch/sparc/conf/files.sparc:1.156 --- src/sys/arch/sparc/conf/files.sparc:1.155 Thu Apr 21 18:27:29 2016 +++ src/sys/arch/sparc/conf/files.sparc Sat Apr 30 05:24:45 2016 @@ -1,4 +1,4 @@ -# $NetBSD: files.sparc,v 1.155 2016/04/21 18:27:29 macallan Exp $ +# $NetBSD: files.sparc,v 1.156 2016/04/30 05:24:45 macallan Exp $ # @(#)files.sparc 8.1 (Berkeley) 7/19/93 # sparc-specific configuration info @@ -256,7 +256,7 @@ device cgeight: bt_dac, fb, rasops24, pf attach cgeight at obio file arch/sparc/dev/cgeight.c cgeight needs-flag -device cgfourteen: fb, rasops8, wsemuldisplaydev, vcons +device cgfourteen: fb, rasops8, wsemuldisplaydev, vcons, glyphcache attach cgfourteen at obio file arch/sparc/dev/cgfourteen.c cgfourteen needs-flag
CVS commit: src/sys/arch/sparc/conf
Module Name:src Committed By: macallan Date: Thu Apr 21 18:27:29 UTC 2016 Modified Files: src/sys/arch/sparc/conf: files.sparc Log Message: cgfourteen needs vcons To generate a diff of this commit: cvs rdiff -u -r1.154 -r1.155 src/sys/arch/sparc/conf/files.sparc 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/sparc/conf/files.sparc diff -u src/sys/arch/sparc/conf/files.sparc:1.154 src/sys/arch/sparc/conf/files.sparc:1.155 --- src/sys/arch/sparc/conf/files.sparc:1.154 Tue Apr 16 06:57:05 2013 +++ src/sys/arch/sparc/conf/files.sparc Thu Apr 21 18:27:29 2016 @@ -1,4 +1,4 @@ -# $NetBSD: files.sparc,v 1.154 2013/04/16 06:57:05 jdc Exp $ +# $NetBSD: files.sparc,v 1.155 2016/04/21 18:27:29 macallan Exp $ # @(#)files.sparc 8.1 (Berkeley) 7/19/93 # sparc-specific configuration info @@ -256,7 +256,7 @@ device cgeight: bt_dac, fb, rasops24, pf attach cgeight at obio file arch/sparc/dev/cgeight.c cgeight needs-flag -device cgfourteen: fb, rasops8, wsemuldisplaydev +device cgfourteen: fb, rasops8, wsemuldisplaydev, vcons attach cgfourteen at obio file arch/sparc/dev/cgfourteen.c cgfourteen needs-flag
CVS commit: src/sys/arch/sparc/conf
Module Name:src Committed By: macallan Date: Wed Apr 13 17:32:27 UTC 2016 Modified Files: src/sys/arch/sparc/conf: GENERIC INSTALL Log Message: - purge long obsolete RASTERCONSOLE - add mgx To generate a diff of this commit: cvs rdiff -u -r1.249 -r1.250 src/sys/arch/sparc/conf/GENERIC cvs rdiff -u -r1.91 -r1.92 src/sys/arch/sparc/conf/INSTALL 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/sparc/conf/GENERIC diff -u src/sys/arch/sparc/conf/GENERIC:1.249 src/sys/arch/sparc/conf/GENERIC:1.250 --- src/sys/arch/sparc/conf/GENERIC:1.249 Sat Sep 26 11:16:13 2015 +++ src/sys/arch/sparc/conf/GENERIC Wed Apr 13 17:32:27 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.249 2015/09/26 11:16:13 maxv Exp $ +# $NetBSD: GENERIC,v 1.250 2016/04/13 17:32:27 macallan Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/sparc/conf/std.sparc" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.249 $" +#ident "GENERIC-$Revision: 1.250 $" maxusers 32 @@ -43,13 +43,6 @@ options SUN4_MMU3L # sun4/400 3-level M # Blink the power LED on some machines to indicate the system load. #options BLINK -## Use a faster console than the PROM's slow drawing routines. Not needed -## for headless (no framebuffer) machines. -## These is obsolete for wscons kernels -#options RASTERCONSOLE # fast rasterop console -#options RASTERCONSOLE_FGCOL=WSCOL_BLACK -#options RASTERCONSOLE_BGCOL=WSCOL_WHITE - # wscons stuff #options WSEMUL_SUN options WSEMUL_VT100 @@ -65,7 +58,6 @@ options WSDISPLAY_COMPAT_USL # wsconsc options WSDISPLAY_SCROLLSUPPORT -# generic options vlid for both wscons and RASTERCONSOLE options FONT_GALLANT12x22 # the console font options FONT_BOLD8x16 # a somewhat smaller font @@ -688,8 +680,10 @@ cgsix0 at obio0 addr 0x0b00 level 4 tcx0 at sbus? slot ? offset ? ## Sun CG12 / Matrox SG3 accelerated 24bit framebuffer -## runs monochrome only for now cgtwelve* at sbus? slot ? offset ? +# the driver can use the color framebuffer or the monochrome overlay +# the latter is faster +options CG12_COLOR # Sun "cgfourteen" accelerated 24-bit framebuffer. cgfourteen* at obio0 # sun4m @@ -707,6 +701,9 @@ zx* at sbus? slot ? offset ? # Fujitsu AG-10e accelerated graphics 8/24-bit board agten* at sbus? slot ? offset ? +## Southland Media Systems (now Quantum 3D) MGX +mgx* at sbus? slot ? offset ? + # generic framebuffer console genfb* at sbus? slot ? offset ? Index: src/sys/arch/sparc/conf/INSTALL diff -u src/sys/arch/sparc/conf/INSTALL:1.91 src/sys/arch/sparc/conf/INSTALL:1.92 --- src/sys/arch/sparc/conf/INSTALL:1.91 Sat Sep 26 11:16:13 2015 +++ src/sys/arch/sparc/conf/INSTALL Wed Apr 13 17:32:27 2016 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.91 2015/09/26 11:16:13 maxv Exp $ +# $NetBSD: INSTALL,v 1.92 2016/04/13 17:32:27 macallan Exp $ # # from: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp # @@ -40,14 +40,6 @@ options SUN4_MMU3L # 3-level MMU on sun # Blink the power LED on some machines to indicate the system load. #options BLINK -## Use a faster console than the PROM's slow drawing routines. Not needed -## for headless (no framebuffer) machines. -#options RASTERCONSOLE # fast rasterop console -options FONT_GALLANT12x22 # the console font -options FONT_BOLD8x16 # a somewhat smaller font -#options RASTERCONSOLE_FGCOL=WSCOL_BLACK -#options RASTERCONSOLE_BGCOL=WSCOL_WHITE - # wscons stuff #options WSEMUL_SUN options WSEMUL_VT100 @@ -59,6 +51,8 @@ options WS_DEFAULT_FG=WSCOL_BLACK options WS_DEFAULT_BG=WSCOL_LIGHT_WHITE options WS_KERNEL_FG=WSCOL_GREEN options WS_KERNEL_BG=WSCOL_LIGHT_WHITE +options FONT_GALLANT12x22 # the console font +options FONT_BOLD8x16 # a somewhat smaller font System options that are the same for all ports @@ -573,6 +567,9 @@ zx* at sbus? slot ? offset ? # Fujitsu AG-10e accelerated graphics 8/24-bit board agten* at sbus? slot ? offset ? +## Southland Media Systems (now Quantum 3D) MGX +mgx* at sbus? slot ? offset ? + # generic framebuffer console genfb* at sbus? slot ? offset ?
CVS commit: src/sys/arch/sparc/conf
Module Name:src
Committed By: uebayasi
Date: Sat Aug 22 23:51:48 UTC 2015
Modified Files:
src/sys/arch/sparc/conf: kern.ldscript
Log Message:
.interp and friends are unlikely to appear in kernels.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sparc/conf/kern.ldscript
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/sparc/conf/kern.ldscript
diff -u src/sys/arch/sparc/conf/kern.ldscript:1.9 src/sys/arch/sparc/conf/kern.ldscript:1.10
--- src/sys/arch/sparc/conf/kern.ldscript:1.9 Sat Aug 22 23:49:54 2015
+++ src/sys/arch/sparc/conf/kern.ldscript Sat Aug 22 23:51:48 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.9 2015/08/22 23:49:54 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript,v 1.10 2015/08/22 23:51:48 uebayasi Exp $ */
/*
* Kernel linker script for NetBSD/sparc. This script is based on
@@ -15,13 +15,6 @@ SECTIONS
{
/* Read-only sections, merged into text segment: */
. = 0x1 + SIZEOF_HEADERS;
- .interp : { *(.interp) }
- .hash : { *(.hash) }
- .dynsym: { *(.dynsym) }
- .dynstr: { *(.dynstr) }
- .gnu.version : { *(.gnu.version) }
- .gnu.version_d : { *(.gnu.version_d) }
- .gnu.version_r : { *(.gnu.version_r) }
.text :
{
*(.text)
CVS commit: src/sys/arch/sparc/conf
Module Name:src
Committed By: uebayasi
Date: Sat Nov 15 12:37:37 UTC 2014
Modified Files:
src/sys/arch/sparc/conf: Makefile.sparc
Log Message:
Use LINKSCRIPT.
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/sys/arch/sparc/conf/Makefile.sparc
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/sparc/conf/Makefile.sparc
diff -u src/sys/arch/sparc/conf/Makefile.sparc:1.89 src/sys/arch/sparc/conf/Makefile.sparc:1.90
--- src/sys/arch/sparc/conf/Makefile.sparc:1.89 Thu Oct 3 22:01:04 2013
+++ src/sys/arch/sparc/conf/Makefile.sparc Sat Nov 15 12:37:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sparc,v 1.89 2013/10/03 22:01:04 mrg Exp $
+# $NetBSD: Makefile.sparc,v 1.90 2014/11/15 12:37:37 uebayasi Exp $
# Makefile for NetBSD
#
@@ -61,7 +61,8 @@ amd7930intr.o bsd_fdintr.o lock_stubs.o:
TEXTADDR?= F0004000
EXTRA_LINKFLAGS= -X
KERN_LDSCRIPT?= kern.ldscript
-LINKFORMAT= -n -T ${SPARC}/conf/${KERN_LDSCRIPT}
+LINKFORMAT= -n
+LINKSCRIPT= -T ${SPARC}/conf/${KERN_LDSCRIPT}
##
## (6) port specific target dependencies
CVS commit: src/sys/arch/sparc/conf
Module Name:src
Committed By: mrg
Date: Thu Oct 3 22:01:04 UTC 2013
Modified Files:
src/sys/arch/sparc/conf: Makefile.sparc
Log Message:
add -Wa,-Av8 to CFLAGS and AFLAGS to fix kernel build with binutils 2.23.2.
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/sparc/conf/Makefile.sparc
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/sparc/conf/Makefile.sparc
diff -u src/sys/arch/sparc/conf/Makefile.sparc:1.88 src/sys/arch/sparc/conf/Makefile.sparc:1.89
--- src/sys/arch/sparc/conf/Makefile.sparc:1.88 Mon Jan 17 18:11:10 2011
+++ src/sys/arch/sparc/conf/Makefile.sparc Thu Oct 3 22:01:04 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sparc,v 1.88 2011/01/17 18:11:10 joerg Exp $
+# $NetBSD: Makefile.sparc,v 1.89 2013/10/03 22:01:04 mrg Exp $
# Makefile for NetBSD
#
@@ -34,7 +34,9 @@ GENASSYM_CONF= ${SPARC}/sparc/genassym.c
# work around GCC (egcs-2.91.66) bug which is liable
# to use FPU registers as temporaries:
CFLAGS+= -mno-fpu
+CFLAGS+= -Wa,-Av8
AFLAGS+= -x assembler-with-cpp
+AFLAGS+= -Wa,-Av8
##
## (3) libkern and compat
CVS commit: src/sys/arch/sparc/conf
Module Name:src Committed By: uwe Date: Wed Mar 13 00:36:52 UTC 2013 Removed Files: src/sys/arch/sparc/conf: BILL-THE-CAT Log Message: HE WAS OBEDIANT To generate a diff of this commit: cvs rdiff -u -r1.53 -r0 src/sys/arch/sparc/conf/BILL-THE-CAT Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc/conf
Module Name:src Committed By: macallan Date: Thu Feb 7 16:19:16 UTC 2013 Modified Files: src/sys/arch/sparc/conf: GENERIC INSTALL Log Message: add sx at mainbus To generate a diff of this commit: cvs rdiff -u -r1.235 -r1.236 src/sys/arch/sparc/conf/GENERIC cvs rdiff -u -r1.83 -r1.84 src/sys/arch/sparc/conf/INSTALL 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/sparc/conf/GENERIC diff -u src/sys/arch/sparc/conf/GENERIC:1.235 src/sys/arch/sparc/conf/GENERIC:1.236 --- src/sys/arch/sparc/conf/GENERIC:1.235 Wed Oct 17 14:48:17 2012 +++ src/sys/arch/sparc/conf/GENERIC Thu Feb 7 16:19:15 2013 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.235 2012/10/17 14:48:17 apb Exp $ +# $NetBSD: GENERIC,v 1.236 2013/02/07 16:19:15 macallan Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include arch/sparc/conf/std.sparc options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.235 $ +#ident GENERIC-$Revision: 1.236 $ maxusers 32 @@ -261,6 +261,9 @@ cpuunit0 at mainbus0 # sun4d cpuunit* at mainbus0 # sun4d cpu0 at cpuunit0# sun4d + SX rendering engine found in SS20 and SS10SX +sx0 at mainbus0 + Bus types found on SPARC systems. sbus0 at mainbus0# sun4c Index: src/sys/arch/sparc/conf/INSTALL diff -u src/sys/arch/sparc/conf/INSTALL:1.83 src/sys/arch/sparc/conf/INSTALL:1.84 --- src/sys/arch/sparc/conf/INSTALL:1.83 Fri Aug 17 20:11:41 2012 +++ src/sys/arch/sparc/conf/INSTALL Thu Feb 7 16:19:16 2013 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.83 2012/08/17 20:11:41 abs Exp $ +# $NetBSD: INSTALL,v 1.84 2013/02/07 16:19:16 macallan Exp $ # # from: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp # @@ -212,6 +212,9 @@ options INET # IP (Internet Protocol) mainbus0 at root cpu0 at mainbus0 + SX rendering engine found in SS20 and SS10SX +sx0 at mainbus0 + Bus types found on SPARC systems. sbus0 at mainbus0# sun4c
CVS commit: src/sys/arch/sparc/conf
Module Name:src Committed By: macallan Date: Tue Jun 26 02:04:56 UTC 2012 Modified Files: src/sys/arch/sparc/conf: GENERIC INSTALL KRUPS MRCOFFEE TADPOLE3GX Log Message: switch to WSEMUL_VT100 to reduce differences with sparc64 and other wscons and fb console using ports WSEMUL_SUN is left in but commented out so whoever wants it back can have it with minimal effort To generate a diff of this commit: cvs rdiff -u -r1.232 -r1.233 src/sys/arch/sparc/conf/GENERIC cvs rdiff -u -r1.81 -r1.82 src/sys/arch/sparc/conf/INSTALL cvs rdiff -u -r1.59 -r1.60 src/sys/arch/sparc/conf/KRUPS cvs rdiff -u -r1.36 -r1.37 src/sys/arch/sparc/conf/MRCOFFEE cvs rdiff -u -r1.56 -r1.57 src/sys/arch/sparc/conf/TADPOLE3GX 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/sparc/conf/GENERIC diff -u src/sys/arch/sparc/conf/GENERIC:1.232 src/sys/arch/sparc/conf/GENERIC:1.233 --- src/sys/arch/sparc/conf/GENERIC:1.232 Sun Mar 11 06:18:46 2012 +++ src/sys/arch/sparc/conf/GENERIC Tue Jun 26 02:04:55 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.232 2012/03/11 06:18:46 nakayama Exp $ +# $NetBSD: GENERIC,v 1.233 2012/06/26 02:04:55 macallan Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include arch/sparc/conf/std.sparc options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.232 $ +#ident GENERIC-$Revision: 1.233 $ maxusers 32 @@ -51,8 +51,8 @@ options SUN4_MMU3L # sun4/400 3-level M #options RASTERCONSOLE_BGCOL=WSCOL_WHITE # wscons stuff -options WSEMUL_SUN -#options WSEMUL_VT100 +#options WSEMUL_SUN +options WSEMUL_VT100 options WSDISPLAY_COMPAT_RAWKBD options WSDISPLAY_CUSTOM_OUTPUT options WS_DEFAULT_FG=WSCOL_BLACK Index: src/sys/arch/sparc/conf/INSTALL diff -u src/sys/arch/sparc/conf/INSTALL:1.81 src/sys/arch/sparc/conf/INSTALL:1.82 --- src/sys/arch/sparc/conf/INSTALL:1.81 Sun Mar 11 06:18:46 2012 +++ src/sys/arch/sparc/conf/INSTALL Tue Jun 26 02:04:55 2012 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.81 2012/03/11 06:18:46 nakayama Exp $ +# $NetBSD: INSTALL,v 1.82 2012/06/26 02:04:55 macallan Exp $ # # from: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp # @@ -49,8 +49,8 @@ options FONT_BOLD8x16 # a somewhat sma #options RASTERCONSOLE_BGCOL=WSCOL_WHITE # wscons stuff -options WSEMUL_SUN -#options WSEMUL_VT100 +#options WSEMUL_SUN +options WSEMUL_VT100 options WSDISPLAY_COMPAT_RAWKBD options WSDISPLAY_CUSTOM_OUTPUT options WS_DEFAULT_FG=WSCOL_BLACK Index: src/sys/arch/sparc/conf/KRUPS diff -u src/sys/arch/sparc/conf/KRUPS:1.59 src/sys/arch/sparc/conf/KRUPS:1.60 --- src/sys/arch/sparc/conf/KRUPS:1.59 Tue Jun 5 08:44:15 2012 +++ src/sys/arch/sparc/conf/KRUPS Tue Jun 26 02:04:55 2012 @@ -1,4 +1,4 @@ -# $NetBSD: KRUPS,v 1.59 2012/06/05 08:44:15 abs Exp $ +# $NetBSD: KRUPS,v 1.60 2012/06/26 02:04:55 macallan Exp $ # From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp # # Krups (JavaStation-NC) machine description file @@ -8,7 +8,7 @@ include arch/sparc/conf/std.sparc options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident KRUPS-$Revision: 1.59 $ +#ident KRUPS-$Revision: 1.60 $ maxusers 32 @@ -74,7 +74,7 @@ options NFS_BOOT_DHCP wscons options # builtin terminal emulations -options WSEMUL_SUN # sun terminal emulation +#options WSEMUL_SUN # sun terminal emulation options WSEMUL_VT100 # VT100 / VT220 emulation options WSEMUL_DEFAULT=\vt100\ Index: src/sys/arch/sparc/conf/MRCOFFEE diff -u src/sys/arch/sparc/conf/MRCOFFEE:1.36 src/sys/arch/sparc/conf/MRCOFFEE:1.37 --- src/sys/arch/sparc/conf/MRCOFFEE:1.36 Sun Mar 11 06:18:46 2012 +++ src/sys/arch/sparc/conf/MRCOFFEE Tue Jun 26 02:04:55 2012 @@ -1,4 +1,4 @@ -# $NetBSD: MRCOFFEE,v 1.36 2012/03/11 06:18:46 nakayama Exp $ +# $NetBSD: MRCOFFEE,v 1.37 2012/06/26 02:04:55 macallan Exp $ # From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp # # Mr.Coffee (JavaStation 1) machine description file @@ -12,7 +12,7 @@ include arch/sparc/conf/std.sparc options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident MRCOFFEE-$Revision: 1.36 $ +#ident MRCOFFEE-$Revision: 1.37 $ maxusers 32 @@ -30,7 +30,7 @@ options SUN4M # sun4m - SS10, SS20, Cl #options BLINK # builtin terminal emulations -options WSEMUL_SUN # sun terminal emulation +#options WSEMUL_SUN # sun terminal emulation options WSEMUL_VT100 # VT100 / VT220 emulation options WSEMUL_DEFAULT=\vt100\ Index: src/sys/arch/sparc/conf/TADPOLE3GX diff -u src/sys/arch/sparc/conf/TADPOLE3GX:1.56 src/sys/arch/sparc/conf/TADPOLE3GX:1.57 --- src/sys/arch/sparc/conf/TADPOLE3GX:1.56 Tue Jun 5 08:44:15 2012 +++ src/sys/arch/sparc/conf/TADPOLE3GX Tue Jun 26 02:04:55 2012 @@ -1,4 +1,4 @@ -# $NetBSD: TADPOLE3GX,v 1.56 2012/06/05 08:44:15 abs Exp $ +# $NetBSD: TADPOLE3GX,v 1.57 2012/06/26 02:04:55 macallan Exp $
CVS commit: src/sys/arch/sparc/conf
Module Name:src Committed By: nakayama Date: Sun Mar 11 06:18:46 UTC 2012 Modified Files: src/sys/arch/sparc/conf: BILL-THE-CAT GENERIC INSTALL KRUPS MRCOFFEE TADPOLE3GX Log Message: Remove stray comments for LKM. To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/sys/arch/sparc/conf/BILL-THE-CAT cvs rdiff -u -r1.231 -r1.232 src/sys/arch/sparc/conf/GENERIC cvs rdiff -u -r1.80 -r1.81 src/sys/arch/sparc/conf/INSTALL cvs rdiff -u -r1.57 -r1.58 src/sys/arch/sparc/conf/KRUPS cvs rdiff -u -r1.35 -r1.36 src/sys/arch/sparc/conf/MRCOFFEE cvs rdiff -u -r1.54 -r1.55 src/sys/arch/sparc/conf/TADPOLE3GX 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/sparc/conf/BILL-THE-CAT diff -u src/sys/arch/sparc/conf/BILL-THE-CAT:1.51 src/sys/arch/sparc/conf/BILL-THE-CAT:1.52 --- src/sys/arch/sparc/conf/BILL-THE-CAT:1.51 Tue Nov 22 21:25:36 2011 +++ src/sys/arch/sparc/conf/BILL-THE-CAT Sun Mar 11 06:18:46 2012 @@ -1,4 +1,4 @@ -# $NetBSD: BILL-THE-CAT,v 1.51 2011/11/22 21:25:36 tls Exp $ +# $NetBSD: BILL-THE-CAT,v 1.52 2012/03/11 06:18:46 nakayama Exp $ # From: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp include arch/sparc/conf/std.sparc @@ -53,8 +53,6 @@ options KTRACE options SYSVSEM # System V semaphores options SYSVSHM # System V shared memory -## Loadable kernel module support; still under development. - options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) #options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel @@ -171,7 +169,7 @@ options INET # IP (Internet Protocol) #options NETATALK # AppleTalk (over Ethernet) protocol #options NTP # Network Time Protocol in-kernel support #options PPS_SYNC # Add serial line synchronization for NTP -#options PFIL_HOOKS # Add pfil(9) hooks, intended for custom LKMs. +#options PFIL_HOOKS # Add pfil(9) packet filter hooks #options IPFILTER_LOG # Add ipmon(8) logging for ipfilter device #options IPFILTER_LOOKUP # ippool(8) support #options PPP_BSDCOMP # Add BSD compression to ppp device Index: src/sys/arch/sparc/conf/GENERIC diff -u src/sys/arch/sparc/conf/GENERIC:1.231 src/sys/arch/sparc/conf/GENERIC:1.232 --- src/sys/arch/sparc/conf/GENERIC:1.231 Sat Mar 10 21:51:56 2012 +++ src/sys/arch/sparc/conf/GENERIC Sun Mar 11 06:18:46 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.231 2012/03/10 21:51:56 joerg Exp $ +# $NetBSD: GENERIC,v 1.232 2012/03/11 06:18:46 nakayama Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include arch/sparc/conf/std.sparc options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.231 $ +#ident GENERIC-$Revision: 1.232 $ maxusers 32 @@ -229,7 +229,7 @@ options INET6 # IPV6 #options NETATALK # AppleTalk (over Ethernet) protocol options NTP # Network Time Protocol in-kernel support #options PPS_SYNC # Add serial line synchronization for NTP -options PFIL_HOOKS # Add pfil(9) hooks, intended for custom LKMs. +options PFIL_HOOKS # Add pfil(9) packet filter hooks options IPFILTER_LOG # Add ipmon(8) logging for ipfilter device options IPFILTER_LOOKUP # ippool(8) support options IPFILTER_COMPAT # Compat for IP-Filter Index: src/sys/arch/sparc/conf/INSTALL diff -u src/sys/arch/sparc/conf/INSTALL:1.80 src/sys/arch/sparc/conf/INSTALL:1.81 --- src/sys/arch/sparc/conf/INSTALL:1.80 Sun Dec 18 05:49:32 2011 +++ src/sys/arch/sparc/conf/INSTALL Sun Mar 11 06:18:46 2012 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.80 2011/12/18 05:49:32 dholland Exp $ +# $NetBSD: INSTALL,v 1.81 2012/03/11 06:18:46 nakayama Exp $ # # from: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp # @@ -80,8 +80,6 @@ config netbsd root on ? type ? #options SYSVSEM # System V semaphores #options SYSVSHM # System V shared memory -## Loadable kernel module support; still under development. - options USERCONF # userconf(4) support options PIPE_SOCKETPAIR # smaller, but slower pipe(2) #options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel @@ -199,7 +197,7 @@ options INET # IP (Internet Protocol) #options NETATALK # AppleTalk (over Ethernet) protocol #options NTP # Network Time Protocol in-kernel support #options PPS_SYNC # Add serial line synchronization for NTP -#options PFIL_HOOKS # Add pfil(9) hooks, intended for custom LKMs. +#options PFIL_HOOKS # Add pfil(9) packet filter hooks #options IPFILTER_LOG # Add ipmon(8) logging for ipfilter device #options IPFILTER_LOOKUP # ippool(8) support #options PPP_BSDCOMP # Add BSD compression to ppp device Index: src/sys/arch/sparc/conf/KRUPS diff -u src/sys/arch/sparc/conf/KRUPS:1.57 src/sys/arch/sparc/conf/KRUPS:1.58 --- src/sys/arch/sparc/conf/KRUPS:1.57 Sat Mar 10 21:51:56 2012 +++ src/sys/arch/sparc/conf/KRUPS Sun Mar 11 06:18:46 2012 @@ -1,4 +1,4 @@ -# $NetBSD: KRUPS,v 1.57 2012/03/10
CVS commit: src/sys/arch/sparc/conf
Module Name:src Committed By: macallan Date: Wed Jan 11 17:18:51 UTC 2012 Modified Files: src/sys/arch/sparc/conf: GENERIC Log Message: include a small font To generate a diff of this commit: cvs rdiff -u -r1.229 -r1.230 src/sys/arch/sparc/conf/GENERIC 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/sparc/conf/GENERIC diff -u src/sys/arch/sparc/conf/GENERIC:1.229 src/sys/arch/sparc/conf/GENERIC:1.230 --- src/sys/arch/sparc/conf/GENERIC:1.229 Sun Dec 18 05:49:32 2011 +++ src/sys/arch/sparc/conf/GENERIC Wed Jan 11 17:18:51 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.229 2011/12/18 05:49:32 dholland Exp $ +# $NetBSD: GENERIC,v 1.230 2012/01/11 17:18:51 macallan Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include arch/sparc/conf/std.sparc options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.229 $ +#ident GENERIC-$Revision: 1.230 $ maxusers 32 @@ -67,7 +67,7 @@ options WSDISPLAY_SCROLLSUPPORT # generic options vlid for both wscons and RASTERCONSOLE options FONT_GALLANT12x22 # the console font -#options FONT_BOLD8x16 # a somewhat smaller font +options FONT_BOLD8x16 # a somewhat smaller font System options that are the same for all ports
CVS commit: src/sys/arch/sparc/conf
Module Name:src Committed By: jdc Date: Mon Jan 17 13:43:02 UTC 2011 Modified Files: src/sys/arch/sparc/conf: GENERIC KRUPS MRCOFFEE TADPOLE3GX Log Message: Add (commented out) LOCKDEBUG and SYSCALL_DEBUG options. To generate a diff of this commit: cvs rdiff -u -r1.225 -r1.226 src/sys/arch/sparc/conf/GENERIC cvs rdiff -u -r1.53 -r1.54 src/sys/arch/sparc/conf/KRUPS cvs rdiff -u -r1.31 -r1.32 src/sys/arch/sparc/conf/MRCOFFEE cvs rdiff -u -r1.51 -r1.52 src/sys/arch/sparc/conf/TADPOLE3GX 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/sparc/conf/GENERIC diff -u src/sys/arch/sparc/conf/GENERIC:1.225 src/sys/arch/sparc/conf/GENERIC:1.226 --- src/sys/arch/sparc/conf/GENERIC:1.225 Tue Nov 23 11:14:06 2010 +++ src/sys/arch/sparc/conf/GENERIC Mon Jan 17 13:43:02 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.225 2010/11/23 11:14:06 hannken Exp $ +# $NetBSD: GENERIC,v 1.226 2011/01/17 13:43:02 jdc Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.225 $ +#ident GENERIC-$Revision: 1.226 $ maxusers 32 @@ -143,6 +143,8 @@ ## Enable (possibly expensive) debugging code that may also display messages ## on the system console #options DEBUG +#options LOCKDEBUG +#options SYSCALL_DEBUG ## Make SCSI error messages more verbose when explaining their meanings. options SCSIVERBOSE Index: src/sys/arch/sparc/conf/KRUPS diff -u src/sys/arch/sparc/conf/KRUPS:1.53 src/sys/arch/sparc/conf/KRUPS:1.54 --- src/sys/arch/sparc/conf/KRUPS:1.53 Tue Nov 23 11:14:06 2010 +++ src/sys/arch/sparc/conf/KRUPS Mon Jan 17 13:43:02 2011 @@ -1,4 +1,4 @@ -# $NetBSD: KRUPS,v 1.53 2010/11/23 11:14:06 hannken Exp $ +# $NetBSD: KRUPS,v 1.54 2011/01/17 13:43:02 jdc Exp $ # From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp # # Krups (JavaStation-NC) machine description file @@ -8,7 +8,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident KRUPS-$Revision: 1.53 $ +#ident KRUPS-$Revision: 1.54 $ maxusers 32 @@ -148,6 +148,8 @@ ## Enable (possibly expensive) debugging code that may also display messages ## on the system console #options DEBUG +#options LOCKDEBUG +#options SYSCALL_DEBUG options MIIVERBOSE # verbose PHY autoconfig messages Index: src/sys/arch/sparc/conf/MRCOFFEE diff -u src/sys/arch/sparc/conf/MRCOFFEE:1.31 src/sys/arch/sparc/conf/MRCOFFEE:1.32 --- src/sys/arch/sparc/conf/MRCOFFEE:1.31 Sat Dec 5 20:11:17 2009 +++ src/sys/arch/sparc/conf/MRCOFFEE Mon Jan 17 13:43:02 2011 @@ -1,4 +1,4 @@ -# $NetBSD: MRCOFFEE,v 1.31 2009/12/05 20:11:17 pooka Exp $ +# $NetBSD: MRCOFFEE,v 1.32 2011/01/17 13:43:02 jdc Exp $ # From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp # # Mr.Coffee (JavaStation 1) machine description file @@ -12,7 +12,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident MRCOFFEE-$Revision: 1.31 $ +#ident MRCOFFEE-$Revision: 1.32 $ maxusers 32 @@ -125,6 +125,8 @@ ## Enable (possibly expensive) debugging code that may also display messages ## on the system console #options DEBUG +#options LOCKDEBUG +#options SYSCALL_DEBUG ## Make SCSI error messages more verbose when explaining their meanings. options SCSIVERBOSE Index: src/sys/arch/sparc/conf/TADPOLE3GX diff -u src/sys/arch/sparc/conf/TADPOLE3GX:1.51 src/sys/arch/sparc/conf/TADPOLE3GX:1.52 --- src/sys/arch/sparc/conf/TADPOLE3GX:1.51 Tue Nov 23 11:14:06 2010 +++ src/sys/arch/sparc/conf/TADPOLE3GX Mon Jan 17 13:43:02 2011 @@ -1,4 +1,4 @@ -# $NetBSD: TADPOLE3GX,v 1.51 2010/11/23 11:14:06 hannken Exp $ +# $NetBSD: TADPOLE3GX,v 1.52 2011/01/17 13:43:02 jdc Exp $ include arch/sparc/conf/std.sparc @@ -108,6 +108,8 @@ ## Enable (possibly expensive) debugging code that may also display messages ## on the system console #options DEBUG +#options LOCKDEBUG +#options SYSCALL_DEBUG ## Make SCSI error messages more verbose when explaining their meanings. options SCSIVERBOSE
CVS commit: src/sys/arch/sparc/conf
Module Name:src Committed By: macallan Date: Wed Jul 7 20:58:57 UTC 2010 Modified Files: src/sys/arch/sparc/conf: INSTALL Log Message: make sure to include a small font for machines like the SPARCbook 3GX should fix PR43297 To generate a diff of this commit: cvs rdiff -u -r1.75 -r1.76 src/sys/arch/sparc/conf/INSTALL 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/sparc/conf/INSTALL diff -u src/sys/arch/sparc/conf/INSTALL:1.75 src/sys/arch/sparc/conf/INSTALL:1.76 --- src/sys/arch/sparc/conf/INSTALL:1.75 Fri Apr 16 13:48:35 2010 +++ src/sys/arch/sparc/conf/INSTALL Wed Jul 7 20:58:56 2010 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.75 2010/04/16 13:48:35 pooka Exp $ +# $NetBSD: INSTALL,v 1.76 2010/07/07 20:58:56 macallan Exp $ # # from: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp # @@ -43,8 +43,8 @@ ## Use a faster console than the PROM's slow drawing routines. Not needed ## for headless (no framebuffer) machines. #options RASTERCONSOLE # fast rasterop console -#options FONT_GALLANT12x22 # the console font -#options FONT_BOLD8x16 # a somewhat smaller font +options FONT_GALLANT12x22 # the console font +options FONT_BOLD8x16 # a somewhat smaller font #options RASTERCONSOLE_FGCOL=WSCOL_BLACK #options RASTERCONSOLE_BGCOL=WSCOL_WHITE
CVS commit: src/sys/arch/sparc/conf
Module Name:src Committed By: macallan Date: Wed Mar 24 00:39:07 UTC 2010 Modified Files: src/sys/arch/sparc/conf: GENERIC INSTALL Log Message: enable CG12 support To generate a diff of this commit: cvs rdiff -u -r1.220 -r1.221 src/sys/arch/sparc/conf/GENERIC cvs rdiff -u -r1.73 -r1.74 src/sys/arch/sparc/conf/INSTALL 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/sparc/conf/GENERIC diff -u src/sys/arch/sparc/conf/GENERIC:1.220 src/sys/arch/sparc/conf/GENERIC:1.221 --- src/sys/arch/sparc/conf/GENERIC:1.220 Mon Mar 1 06:14:17 2010 +++ src/sys/arch/sparc/conf/GENERIC Wed Mar 24 00:39:07 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.220 2010/03/01 06:14:17 macallan Exp $ +# $NetBSD: GENERIC,v 1.221 2010/03/24 00:39:07 macallan Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.220 $ +#ident GENERIC-$Revision: 1.221 $ maxusers 32 @@ -688,6 +688,10 @@ # there can be only one tcx0 at sbus? slot ? offset ? +## Sun CG12 / Matrox SG3 accelerated 24bit framebuffer +## runs monochrome only for now +cgtwelve* at sbus? slot ? offset ? + # Sun cgfourteen accelerated 24-bit framebuffer. cgfourteen* at obio0 # sun4m Index: src/sys/arch/sparc/conf/INSTALL diff -u src/sys/arch/sparc/conf/INSTALL:1.73 src/sys/arch/sparc/conf/INSTALL:1.74 --- src/sys/arch/sparc/conf/INSTALL:1.73 Mon Mar 1 06:14:17 2010 +++ src/sys/arch/sparc/conf/INSTALL Wed Mar 24 00:39:07 2010 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.73 2010/03/01 06:14:17 macallan Exp $ +# $NetBSD: INSTALL,v 1.74 2010/03/24 00:39:07 macallan Exp $ # # from: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp # @@ -556,6 +556,11 @@ # there can be only one tcx0 at sbus? slot ? offset ? +## Sun CG12 / Matrox SG3 accelerated 24bit framebuffer +## runs monochrome only for now +## since it occupies 3 SBus slots there's no way to use more than one +cgtwelve0 at sbus? slot ? offset ? + # Sun cgfourteen accelerated 24-bit framebuffer. cgfourteen* at obio0 # sun4m
CVS commit: src/sys/arch/sparc/conf
Module Name:src Committed By: tsutsui Date: Fri Nov 27 11:05:45 UTC 2009 Modified Files: src/sys/arch/sparc/conf: GENERIC Log Message: Move some devices where they should belong to. To generate a diff of this commit: cvs rdiff -u -r1.216 -r1.217 src/sys/arch/sparc/conf/GENERIC 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/sparc/conf/GENERIC diff -u src/sys/arch/sparc/conf/GENERIC:1.216 src/sys/arch/sparc/conf/GENERIC:1.217 --- src/sys/arch/sparc/conf/GENERIC:1.216 Sun Sep 27 13:27:44 2009 +++ src/sys/arch/sparc/conf/GENERIC Fri Nov 27 11:05:45 2009 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.216 2009/09/27 13:27:44 tsutsui Exp $ +# $NetBSD: GENERIC,v 1.217 2009/11/27 11:05:45 tsutsui Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.216 $ +#ident GENERIC-$Revision: 1.217 $ maxusers 32 @@ -484,14 +484,6 @@ #atabus* at ata? #wd* at atabus? drive ? flags 0x -## PCMCIA wavelan card -#wi* at pcmcia? function ? # Lucent WaveLan IEEE (802.11) - -# -# accept filters -pseudo-device accf_data # dataready accept filter -pseudo-device accf_http # httpready accept filter - ## A disk-like interface to files. Can be used to create floppy, CD, ## miniroot images, etc. @@ -576,6 +568,9 @@ #ne* at pcmcia? #sm* at pcmcia? +## PCMCIA wavelan card +#wi* at pcmcia? function ? # Lucent WaveLan IEEE (802.11) + # MII/PHY support exphy* at mii? phy ? # 3Com internal PHYs icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x @@ -633,6 +628,10 @@ #options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too pseudo-device agr # IEEE 802.3ad link aggregation +## accept filters +pseudo-device accf_data # dataready accept filter +pseudo-device accf_http # httpready accept filter + Audio and video devices ## /dev/audio support (`audioamd' plus `audio')
CVS commit: src/sys/arch/sparc/conf
Module Name:src Committed By: tsutsui Date: Sun Sep 27 13:27:44 UTC 2009 Modified Files: src/sys/arch/sparc/conf: BILL-THE-CAT GENERIC INSTALL files.sparc Log Message: Remove commented out and nonexistent cgthree at obio stuff. SPARCclassic has onboard CG3 but it's internally connected via SBus, and there is no info about sun4m machines which actually require cgthree at obio attachment. Info from j...@. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/sys/arch/sparc/conf/BILL-THE-CAT cvs rdiff -u -r1.215 -r1.216 src/sys/arch/sparc/conf/GENERIC cvs rdiff -u -r1.70 -r1.71 src/sys/arch/sparc/conf/INSTALL cvs rdiff -u -r1.147 -r1.148 src/sys/arch/sparc/conf/files.sparc 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/sparc/conf/BILL-THE-CAT diff -u src/sys/arch/sparc/conf/BILL-THE-CAT:1.45 src/sys/arch/sparc/conf/BILL-THE-CAT:1.46 --- src/sys/arch/sparc/conf/BILL-THE-CAT:1.45 Fri Mar 6 20:31:52 2009 +++ src/sys/arch/sparc/conf/BILL-THE-CAT Sun Sep 27 13:27:44 2009 @@ -1,4 +1,4 @@ -# $NetBSD: BILL-THE-CAT,v 1.45 2009/03/06 20:31:52 joerg Exp $ +# $NetBSD: BILL-THE-CAT,v 1.46 2009/09/27 13:27:44 tsutsui Exp $ # From: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp include arch/sparc/conf/std.sparc @@ -507,7 +507,6 @@ ## Sun cgthree Sbus color framebuffer cgthree0 at sbus? slot ? offset ? cgthree* at sbus? slot ? offset ? -#cgthree0 at obio? slot ? offset ? # sun4m ## Sun cgfour color framebuffer with overlay plane. See above comment ## regarding overlay plane. Index: src/sys/arch/sparc/conf/GENERIC diff -u src/sys/arch/sparc/conf/GENERIC:1.215 src/sys/arch/sparc/conf/GENERIC:1.216 --- src/sys/arch/sparc/conf/GENERIC:1.215 Thu Aug 6 18:28:41 2009 +++ src/sys/arch/sparc/conf/GENERIC Sun Sep 27 13:27:44 2009 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.215 2009/08/06 18:28:41 macallan Exp $ +# $NetBSD: GENERIC,v 1.216 2009/09/27 13:27:44 tsutsui Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.215 $ +#ident GENERIC-$Revision: 1.216 $ maxusers 32 @@ -667,7 +667,6 @@ ## Sun cgthree Sbus color framebuffer cgthree0 at sbus? slot ? offset ? cgthree* at sbus? slot ? offset ? -#cgthree0 at obio? slot ? offset ? # sun4m ## Sun cgfour color framebuffer with overlay plane. See above comment ## regarding overlay plane. Index: src/sys/arch/sparc/conf/INSTALL diff -u src/sys/arch/sparc/conf/INSTALL:1.70 src/sys/arch/sparc/conf/INSTALL:1.71 --- src/sys/arch/sparc/conf/INSTALL:1.70 Thu Aug 6 18:28:41 2009 +++ src/sys/arch/sparc/conf/INSTALL Sun Sep 27 13:27:44 2009 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.70 2009/08/06 18:28:41 macallan Exp $ +# $NetBSD: INSTALL,v 1.71 2009/09/27 13:27:44 tsutsui Exp $ # # from: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp # @@ -537,7 +537,6 @@ ## Sun cgthree Sbus color framebuffer cgthree0 at sbus? slot ? offset ? cgthree* at sbus? slot ? offset ? -#cgthree0 at obio? slot ? offset ? # sun4m ## Sun cgfour color framebuffer with overlay plane. See above comment ## regarding overlay plane. Index: src/sys/arch/sparc/conf/files.sparc diff -u src/sys/arch/sparc/conf/files.sparc:1.147 src/sys/arch/sparc/conf/files.sparc:1.148 --- src/sys/arch/sparc/conf/files.sparc:1.147 Wed Nov 19 18:36:00 2008 +++ src/sys/arch/sparc/conf/files.sparc Sun Sep 27 13:27:44 2009 @@ -1,4 +1,4 @@ -# $NetBSD: files.sparc,v 1.147 2008/11/19 18:36:00 ad Exp $ +# $NetBSD: files.sparc,v 1.148 2009/09/27 13:27:44 tsutsui Exp $ # @(#)files.sparc 8.1 (Berkeley) 7/19/93 # sparc-specific configuration info @@ -231,9 +231,6 @@ attach cgtwo at vme file arch/sparc/dev/cgtwo.c cgtwo needs-flag -attach cgthree at obio with cgthree_obio -file arch/sparc/dev/cgthree_obio.c cgthree_obio obio - device cgfour: bt_dac, fb, rasops8, pfour attach cgfour at obio file arch/sparc/dev/cgfour.c cgfour needs-flag
CVS commit: src/sys/arch/sparc/conf
Module Name:src Committed By: uwe Date: Sun Aug 16 19:12:55 UTC 2009 Modified Files: src/sys/arch/sparc/conf: MRCOFFEE Log Message: options COMPAT_50 To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/arch/sparc/conf/MRCOFFEE 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/sparc/conf/MRCOFFEE diff -u src/sys/arch/sparc/conf/MRCOFFEE:1.29 src/sys/arch/sparc/conf/MRCOFFEE:1.30 --- src/sys/arch/sparc/conf/MRCOFFEE:1.29 Sun Aug 16 00:24:59 2009 +++ src/sys/arch/sparc/conf/MRCOFFEE Sun Aug 16 19:12:55 2009 @@ -1,4 +1,4 @@ -# $NetBSD: MRCOFFEE,v 1.29 2009/08/16 00:24:59 macallan Exp $ +# $NetBSD: MRCOFFEE,v 1.30 2009/08/16 19:12:55 uwe Exp $ # From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp # # Mr.Coffee (JavaStation 1) machine description file @@ -12,7 +12,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident MRCOFFEE-$Revision: 1.29 $ +#ident MRCOFFEE-$Revision: 1.30 $ maxusers 32 @@ -161,6 +161,7 @@ options COMPAT_20 # NetBSD 2.0 binary compatibility options COMPAT_30 # NetBSD 3.0 binary compatibility options COMPAT_40 # NetBSD 4.0 binary compatibility +options COMPAT_50 # NetBSD 5.0 binary compatibility options COMPAT_SUNOS # SunOS 4.x binary compatibility options COMPAT_SVR4 # SunOS 5.x binary compatibility options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
CVS commit: src/sys/arch/sparc/conf
Module Name:src Committed By: macallan Date: Sun Aug 16 00:24:59 UTC 2009 Modified Files: src/sys/arch/sparc/conf: MRCOFFEE Log Message: add the missing wscons bits so this kernel builds again needs testing on actual hardware which I don't have. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/arch/sparc/conf/MRCOFFEE 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/sparc/conf/MRCOFFEE diff -u src/sys/arch/sparc/conf/MRCOFFEE:1.28 src/sys/arch/sparc/conf/MRCOFFEE:1.29 --- src/sys/arch/sparc/conf/MRCOFFEE:1.28 Mon Jun 22 14:57:52 2009 +++ src/sys/arch/sparc/conf/MRCOFFEE Sun Aug 16 00:24:59 2009 @@ -1,4 +1,4 @@ -# $NetBSD: MRCOFFEE,v 1.28 2009/06/22 14:57:52 tsutsui Exp $ +# $NetBSD: MRCOFFEE,v 1.29 2009/08/16 00:24:59 macallan Exp $ # From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp # # Mr.Coffee (JavaStation 1) machine description file @@ -12,7 +12,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident MRCOFFEE-$Revision: 1.28 $ +#ident MRCOFFEE-$Revision: 1.29 $ maxusers 32 @@ -29,16 +29,21 @@ # Blink the power LED on some machines to indicate the system load. #options BLINK -# XXX: uwe: TCX driver doesn't support RASTERCONSOLE, so don't bother -## Use a faster console than the PROM's slow drawing routines. Not needed -## for headless (no framebuffer) machines. -#options RASTERCONSOLE # fast rasterop console -#options FONT_GALLANT12x22 # the console font -#options FONT_BOLD8x16 # a somewhat smaller font -## default console colors: black-on-white; this can be changed -## using the following two options. -#options RASTERCONSOLE_FGCOL=WSCOL_BLACK -#options RASTERCONSOLE_BGCOL=WSCOL_WHITE +# builtin terminal emulations +options WSEMUL_SUN # sun terminal emulation +options WSEMUL_VT100 # VT100 / VT220 emulation +options WSEMUL_DEFAULT=\vt100\ + +# customization of console and kernel output - see dev/wscons/wsdisplayvar.h +options WSDISPLAY_COMPAT_RAWKBD +options WSDISPLAY_CUSTOM_OUTPUT +options WS_DEFAULT_FG=WSCOL_BLACK +options WS_DEFAULT_BG=WSCOL_LIGHT_WHITE +options WS_KERNEL_FG=WSCOL_GREEN +options WS_KERNEL_BG=WSCOL_LIGHT_WHITE +options WSDISPLAY_SCROLLSUPPORT +options FONT_GALLANT12x22 # the console font + System options that are the same for all ports @@ -247,9 +252,14 @@ Keyboard and mouse pckbc0 at obio0 -kbd0 at pckbc0 -ms0 at pckbc0 - +#kbd0 at pckbc0 +#ms0 at pckbc0 +#wskbd* at kbd? console ? +#wsmouse* at ms? mux 0 +pckbd* at pckbc? # PC keyboard +pms* at pckbc? # PS/2 mouse for wsmouse +wskbd* at pckbd? console ? +wsmouse* at pms? mux 0 Disk controllers and disks @@ -313,7 +323,7 @@ ## Sun tcx accelerated color framebuffer. tcx0 at sbus? slot ? offset ? - +wsdisplay0 at tcx0 Other device configuration @@ -331,3 +341,6 @@ pseudo-device clockctl # user control of clock subsystem pseudo-device ksyms # /dev/ksyms + +pseudo-device wsmux # mouse and keyboard multiplexor +pseudo-device wsfont
CVS commit: src/sys/arch/sparc/conf
Module Name:src Committed By: macallan Date: Tue May 5 23:58:50 UTC 2009 Modified Files: src/sys/arch/sparc/conf: GENERIC INSTALL Log Message: enable ZX/Leo since we now support wscons on it To generate a diff of this commit: cvs rdiff -u -r1.212 -r1.213 src/sys/arch/sparc/conf/GENERIC cvs rdiff -u -r1.67 -r1.68 src/sys/arch/sparc/conf/INSTALL 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/sparc/conf/GENERIC diff -u src/sys/arch/sparc/conf/GENERIC:1.212 src/sys/arch/sparc/conf/GENERIC:1.213 --- src/sys/arch/sparc/conf/GENERIC:1.212 Tue Mar 24 12:16:12 2009 +++ src/sys/arch/sparc/conf/GENERIC Tue May 5 23:58:50 2009 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.212 2009/03/24 12:16:12 tsutsui Exp $ +# $NetBSD: GENERIC,v 1.213 2009/05/05 23:58:50 macallan Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.212 $ +#ident GENERIC-$Revision: 1.213 $ maxusers 32 @@ -698,12 +698,14 @@ pnozz0 at sbus? slot ? offset ? # Sun ZX/Leo 24-bit framebuffer -# XXX no wsdisplay support -#zx* at sbus? slot ? offset ? +zx* at sbus? slot ? offset ? # Fujitsu AG-10e accelerated graphics 8/24-bit board agten* at sbus? slot ? offset ? +# generic framebuffer console +genfb* at sbus? slot ? offset ? + # make sure wsdisplay0 is the console wsdisplay0 at wsemuldisplaydev? console 1 wsdisplay* at wsemuldisplaydev? Index: src/sys/arch/sparc/conf/INSTALL diff -u src/sys/arch/sparc/conf/INSTALL:1.67 src/sys/arch/sparc/conf/INSTALL:1.68 --- src/sys/arch/sparc/conf/INSTALL:1.67 Fri Mar 6 20:31:52 2009 +++ src/sys/arch/sparc/conf/INSTALL Tue May 5 23:58:50 2009 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.67 2009/03/06 20:31:52 joerg Exp $ +# $NetBSD: INSTALL,v 1.68 2009/05/05 23:58:50 macallan Exp $ # # from: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp # @@ -565,8 +565,7 @@ pnozz0 at sbus? slot ? offset ? # Sun ZX/Leo 24-bit framebuffer -# XXX no wsdisplay support -#zx* at sbus? slot ? offset ? +zx* at sbus? slot ? offset ? # Fujitsu AG-10e accelerated graphics 8/24-bit board agten* at sbus? slot ? offset ?
