CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: martin Date: Sun Oct 25 18:53:12 UTC 2020 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Temporarily disable NTFS for an internal test. To generate a diff of this commit: cvs rdiff -u -r1.230 -r1.231 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.230 src/sys/arch/sparc64/conf/GENERIC:1.231 --- src/sys/arch/sparc64/conf/GENERIC:1.230 Sun Sep 27 13:48:54 2020 +++ src/sys/arch/sparc64/conf/GENERIC Sun Oct 25 18:53:11 2020 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.230 2020/09/27 13:48:54 roy Exp $ +# $NetBSD: GENERIC,v 1.231 2020/10/25 18:53:11 martin 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.230 $" +#ident "GENERIC-$Revision: 1.231 $" maxusers 64 @@ -861,3 +861,6 @@ options PAX_SEGVGUARD=0 # PaX Segmenta # options PAX_MPROTECT=0 # PaX mprotect(2) restrictions # options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug options PAX_ASLR=1 # PaX Address Space Layout Randomization + +# Temporary workaround while analyzing memory corruption when booting from CD +no file-system NTFS
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: martin Date: Mon Oct 26 11:49:45 UTC 2020 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Backout previous, PR 54810 has been fixed. To generate a diff of this commit: cvs rdiff -u -r1.231 -r1.232 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.231 src/sys/arch/sparc64/conf/GENERIC:1.232 --- src/sys/arch/sparc64/conf/GENERIC:1.231 Sun Oct 25 18:53:11 2020 +++ src/sys/arch/sparc64/conf/GENERIC Mon Oct 26 11:49:45 2020 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.231 2020/10/25 18:53:11 martin Exp $ +# $NetBSD: GENERIC,v 1.232 2020/10/26 11:49:45 martin 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.231 $" +#ident "GENERIC-$Revision: 1.232 $" maxusers 64 @@ -861,6 +861,3 @@ options PAX_SEGVGUARD=0 # PaX Segmenta # options PAX_MPROTECT=0 # PaX mprotect(2) restrictions # options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug options PAX_ASLR=1 # PaX Address Space Layout Randomization - -# Temporary workaround while analyzing memory corruption when booting from CD -no file-system NTFS
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: jdc Date: Fri Oct 30 06:44:38 UTC 2020 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Add pcagpio and pcf8574io - hardware status monitors on V210/V240 and E250. To generate a diff of this commit: cvs rdiff -u -r1.232 -r1.233 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.232 src/sys/arch/sparc64/conf/GENERIC:1.233 --- src/sys/arch/sparc64/conf/GENERIC:1.232 Mon Oct 26 11:49:45 2020 +++ src/sys/arch/sparc64/conf/GENERIC Fri Oct 30 06:44:37 2020 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.232 2020/10/26 11:49:45 martin Exp $ +# $NetBSD: GENERIC,v 1.233 2020/10/30 06:44:37 jdc 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.232 $" +#ident "GENERIC-$Revision: 1.233 $" maxusers 64 @@ -826,6 +826,8 @@ lmtemp* at iic? addr? tda* at iic? addr? # fan control on SB1000/2000 dbcool* at iic? addr? # SB25000 seeprom* at iic? addr? # i2c-at24c64 fru's +pcagpio* at iic? addr? # V210/V240 GPIO's +pcf8574io* at iic? addr? # E250 GPIO's ### Other pseudo-devices
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: martin Date: Sun Jan 31 08:07:25 UTC 2021 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Allow local builds to add configuration changes via GENERIC.local To generate a diff of this commit: cvs rdiff -u -r1.233 -r1.234 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.233 src/sys/arch/sparc64/conf/GENERIC:1.234 --- src/sys/arch/sparc64/conf/GENERIC:1.233 Fri Oct 30 06:44:37 2020 +++ src/sys/arch/sparc64/conf/GENERIC Sun Jan 31 08:07:25 2021 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.233 2020/10/30 06:44:37 jdc Exp $ +# $NetBSD: GENERIC,v 1.234 2021/01/31 08:07:25 martin 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.233 $" +#ident "GENERIC-$Revision: 1.234 $" maxusers 64 @@ -419,6 +419,9 @@ fdc0 at sbus? slot ? offset ? # SUNW,fd #fdc0 at ebus?# fdthree, EXPERIMENTAL fd* at fdc0 # the drive itself +# Pull in optional local configuration +cinclude "arch/sparc64/conf/GENERIC.local" + # # accept filters pseudo-device accf_data # "dataready" accept filter
CVS commit: src/sys/arch/sparc64/conf
Module Name:src
Committed By: thorpej
Date: Sun Apr 25 13:22:49 UTC 2021
Modified Files:
src/sys/arch/sparc64/conf: files.sparc64
Log Message:
PCI busses do not attach to "ebus", therefore there is no need for
it to carry the "pcibus" interface attribute.
Fixes kern/56124.
To generate a diff of this commit:
cvs rdiff -u -r1.164 -r1.165 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/files.sparc64
diff -u src/sys/arch/sparc64/conf/files.sparc64:1.164 src/sys/arch/sparc64/conf/files.sparc64:1.165
--- src/sys/arch/sparc64/conf/files.sparc64:1.164 Thu Mar 4 20:17:00 2021
+++ src/sys/arch/sparc64/conf/files.sparc64 Sun Apr 25 13:22:49 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.sparc64,v 1.164 2021/03/04 20:17:00 palle Exp $
+# $NetBSD: files.sparc64,v 1.165 2021/04/25 13:22:49 thorpej Exp $
# @(#)files.sparc64 8.1 (Berkeley) 7/19/93
# sparc64-specific configuration info
@@ -67,7 +67,7 @@ file arch/sparc64/dev/iommu.c sbus | ps
include "dev/ata/files.ata"
-device ebus {[addr = -1]}: pcibus
+device ebus {[addr = -1]}
attach ebus at pci
file arch/sparc64/dev/ebus.c ebus
attach ebus at mainbus with ebus_mainbus
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: jdc Date: Thu Jan 7 09:34:49 UTC 2010 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Add cas, gentbi and gphyter for Sun Cassini/Cassini+ Ethernet. To generate a diff of this commit: cvs rdiff -u -r1.115 -r1.116 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.115 src/sys/arch/sparc64/conf/GENERIC:1.116 --- src/sys/arch/sparc64/conf/GENERIC:1.115 Tue Dec 29 07:00:42 2009 +++ src/sys/arch/sparc64/conf/GENERIC Thu Jan 7 09:34:49 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.115 2009/12/29 07:00:42 macallan Exp $ +# $NetBSD: GENERIC,v 1.116 2010/01/07 09:34:49 jdc Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.115 $" +#ident "GENERIC-$Revision: 1.116 $" maxusers 64 @@ -484,6 +484,7 @@ # UT marks untested. an* at pci? dev ? function ? # Aironet PC4500/PC4800 (802.11) UT ath* at pci? dev ? function ? # Atheros 5210/5211/5212 802.11 UT +cas* at pci? dev ? function ? # Sun Cassini/Cassini+ Ethernet en* at pci? dev ? function ? # ENI/Adaptec ATM UT # XXX causes ICE #ep* at pci? dev ? function ? # 3Com 3c59x @@ -524,6 +525,8 @@ ciphy* at mii? phy ? # Cicada CS8201 Gig-E PHYs dmphy* at mii? phy ? # Davicom DM9101 PHYs exphy* at mii? phy ? # 3Com internal PHYs +gentbi* at mii? phy ? # Generic Ten-Bit 1000BASE-[CLS]X PHYs +gphyter* at mii? phy ? # NS83861 Gig-E PHY icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x ikphy* at mii? phy ? # Intel 82563 PHYs inphy* at mii? phy ? # Intel 82555 PHYs
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: mrg Date: Thu Jan 28 06:04:23 UTC 2010 Modified Files: src/sys/arch/sparc64/conf: SCHIZO Log Message: enable LOCKDEBUG enable bge @ pci enable ieee1394 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/sparc64/conf/SCHIZO 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/SCHIZO diff -u src/sys/arch/sparc64/conf/SCHIZO:1.3 src/sys/arch/sparc64/conf/SCHIZO:1.4 --- src/sys/arch/sparc64/conf/SCHIZO:1.3 Tue Jan 12 14:45:50 2010 +++ src/sys/arch/sparc64/conf/SCHIZO Thu Jan 28 06:04:23 2010 @@ -1,4 +1,4 @@ -# $NetBSD: SCHIZO,v 1.3 2010/01/12 14:45:50 martin Exp $ +# $NetBSD: SCHIZO,v 1.4 2010/01/28 06:04:23 mrg Exp $ # # GENERIC with schizo support enabled, with the annoying schizo interupt # option @@ -7,13 +7,14 @@ include "arch/sparc64/conf/GENERIC.MP" #include "arch/sparc64/conf/GENERIC" -#ident "SCHIZO.$Revision: 1.3 $" +#ident "SCHIZO.$Revision: 1.4 $" options SCHIZO_BUS_SPACE_BROKEN makeoptions DEBUG="-g" options DEBUG options DIAGNOSTIC +options LOCKDEBUG options DB_MAX_WIDTH=160 options DDB_ONPANIC=2 # print stack trace @@ -26,8 +27,12 @@ # this crashes when attaching. no machfb -# this doesn't work yet bge* at pci? dev ? function ? +fwohci* at pci? dev ? function ? # IEEE1394 Open Host Controller +ieee1394if* at fwohci? +fwip* at ieee1394if? # IP over IEEE1394 +sbp* at ieee1394if? euihi ? euilo ? + # this matches when it isn't present. ugh. no admtemp
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: mrg Date: Sat Feb 13 08:54:58 UTC 2010 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: enable schizo, bge, fwohci/sbp and f...@upa, all as seen in SCHIZO config. To generate a diff of this commit: cvs rdiff -u -r1.116 -r1.117 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.116 src/sys/arch/sparc64/conf/GENERIC:1.117 --- src/sys/arch/sparc64/conf/GENERIC:1.116 Thu Jan 7 09:34:49 2010 +++ src/sys/arch/sparc64/conf/GENERIC Sat Feb 13 08:54:58 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.116 2010/01/07 09:34:49 jdc Exp $ +# $NetBSD: GENERIC,v 1.117 2010/02/13 08:54:58 mrg Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.116 $" +#ident "GENERIC-$Revision: 1.117 $" maxusers 64 @@ -236,7 +236,9 @@ sbus* at mainbus0# SBus-based systems psycho* at mainbus0# PCI-based systems +schizo* at mainbus? pci* at psycho? +pci* at schizo? pci* at ppb? ppb* at pci? # `APB' support. ebus* at pci? # ebus devices @@ -484,6 +486,7 @@ # UT marks untested. an* at pci? dev ? function ? # Aironet PC4500/PC4800 (802.11) UT ath* at pci? dev ? function ? # Atheros 5210/5211/5212 802.11 UT +bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet cas* at pci? dev ? function ? # Sun Cassini/Cassini+ Ethernet en* at pci? dev ? function ? # ENI/Adaptec ATM UT # XXX causes ICE @@ -666,6 +669,12 @@ # USB Generic driver ugen* at uhub? port ? +# Firewire support +fwohci* at pci? dev ? function ? # IEEE1394 Open Host Controller +ieee1394if* at fwohci? +fwip* at ieee1394if? # IP over IEEE1394 +sbp* at ieee1394if? euihi ? euilo ? + ## Loopback network interface; required pseudo-device loop @@ -856,6 +865,8 @@ ## Sun FFB ffb* at mainbus0 +upa* at mainbus? +ffb* at upa? ## Sun XVR-1000 gfb* at mainbus0
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: mrg Date: Sat Feb 13 22:24:09 UTC 2010 Modified Files: src/sys/arch/sparc64/conf: SCHIZO Log Message: remove all the devices now present in GENERIC. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sparc64/conf/SCHIZO 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/SCHIZO diff -u src/sys/arch/sparc64/conf/SCHIZO:1.5 src/sys/arch/sparc64/conf/SCHIZO:1.6 --- src/sys/arch/sparc64/conf/SCHIZO:1.5 Sat Feb 6 00:23:30 2010 +++ src/sys/arch/sparc64/conf/SCHIZO Sat Feb 13 22:24:09 2010 @@ -1,4 +1,4 @@ -# $NetBSD: SCHIZO,v 1.5 2010/02/06 00:23:30 mrg Exp $ +# $NetBSD: SCHIZO,v 1.6 2010/02/13 22:24:09 mrg Exp $ # # GENERIC with schizo support enabled, with the annoying schizo interupt # option @@ -7,7 +7,7 @@ include "arch/sparc64/conf/GENERIC.MP" #include "arch/sparc64/conf/GENERIC" -#ident "SCHIZO.$Revision: 1.5 $" +#ident "SCHIZO.$Revision: 1.6 $" options CHEETAH @@ -18,21 +18,8 @@ options DB_MAX_WIDTH=160 options DDB_ONPANIC=2 # print stack trace -upa* at mainbus? -ffb* at upa? - -schizo* at mainbus? -pci* at schizo? - # this crashes when attaching. -no machfb - -bge* at pci? dev ? function ? - -fwohci* at pci? dev ? function ? # IEEE1394 Open Host Controller -ieee1394if* at fwohci? -fwip* at ieee1394if? # IP over IEEE1394 -sbp* at ieee1394if? euihi ? euilo ? +#no machfb # this matches when it isn't present. ugh. no admtemp
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: roy Date: Fri Mar 12 15:12:12 UTC 2010 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Revert part of last patch. Didn't mean to enable pf by default. To generate a diff of this commit: cvs rdiff -u -r1.121 -r1.122 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.121 src/sys/arch/sparc64/conf/GENERIC:1.122 --- src/sys/arch/sparc64/conf/GENERIC:1.121 Fri Mar 12 14:50:55 2010 +++ src/sys/arch/sparc64/conf/GENERIC Fri Mar 12 15:12:12 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.121 2010/03/12 14:50:55 roy Exp $ +# $NetBSD: GENERIC,v 1.122 2010/03/12 15:12:12 roy Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.121 $" +#ident "GENERIC-$Revision: 1.122 $" maxusers 64 @@ -946,8 +946,8 @@ pseudo-device wsfont pseudo-device clockctl # user control of clock subsystem pseudo-device ksyms # /dev/ksyms -pseudo-device pf # PF packet filter -pseudo-device pflog # PF log if +#pseudo-device pf # PF packet filter +#pseudo-device pflog # PF log if pseudo-device fss 4 # file system snapshot device #pseudo-device bcsp # BlueCore Serial Protocol #pseudo-device btuart # Bluetooth HCI UART (H4)
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: nakayama Date: Wed May 12 12:26:00 UTC 2010 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Remove obsolete comment about a data corruption on IDE controllers in Blade 100/Netra X1. Workaround for a data corruption was commited as rev. 1.16 of src/sys/dev/pci/aceride.c in 2005. To generate a diff of this commit: cvs rdiff -u -r1.126 -r1.127 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.126 src/sys/arch/sparc64/conf/GENERIC:1.127 --- src/sys/arch/sparc64/conf/GENERIC:1.126 Sat May 8 22:16:30 2010 +++ src/sys/arch/sparc64/conf/GENERIC Wed May 12 12:25:59 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.126 2010/05/08 22:16:30 mrg Exp $ +# $NetBSD: GENERIC,v 1.127 2010/05/12 12:25:59 nakayama Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.126 $" +#ident "GENERIC-$Revision: 1.127 $" maxusers 64 @@ -392,10 +392,7 @@ # 0x0fac means 'use PIO mode 4, DMA mode 2, disable UltraDMA'. # (0xc=1100, 0xa=1010, 0xf=) # 0x means "use whatever the drive claims to support". - -## Disable UDMA 4 which causes data corruption on the Acer Labs -## chipset on Sun Blade 100 and Netra X1 machines. -wd* at atabus? drive ? flags 0x +wd* at atabus? drive ? flags 0x cd* at atapibus? drive ? flags 0x # ATAPI CD-ROM drives sd* at atapibus? drive ? flags 0x # ATAPI disk drives
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: tsutsui Date: Sat May 22 15:55:03 UTC 2010 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Enable bwtwo(4). To generate a diff of this commit: cvs rdiff -u -r1.127 -r1.128 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.127 src/sys/arch/sparc64/conf/GENERIC:1.128 --- src/sys/arch/sparc64/conf/GENERIC:1.127 Wed May 12 12:25:59 2010 +++ src/sys/arch/sparc64/conf/GENERIC Sat May 22 15:55:02 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.127 2010/05/12 12:25:59 nakayama Exp $ +# $NetBSD: GENERIC,v 1.128 2010/05/22 15:55:02 tsutsui Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.127 $" +#ident "GENERIC-$Revision: 1.128 $" maxusers 64 @@ -851,13 +851,9 @@ midi* at midibus? -## 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 -## "cgfour". - -#bwtwo0 at sbus? slot ? offset ? # sun4c and sun4m -#bwtwo* at sbus? slot ? offset ? +## Sun "bwtwo" black and white framebuffer +bwtwo0 at sbus? slot ? offset ? +bwtwo* at sbus? slot ? offset ? ## Sun "cgthree" Sbus color framebuffer cgthree0 at sbus? slot ? offset ?
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: tsutsui Date: Sat May 22 15:55:41 UTC 2010 Modified Files: src/sys/arch/sparc64/conf: INSTALL Log Message: GENERIC32 -> GENERIC in comment. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/arch/sparc64/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/sparc64/conf/INSTALL diff -u src/sys/arch/sparc64/conf/INSTALL:1.26 src/sys/arch/sparc64/conf/INSTALL:1.27 --- src/sys/arch/sparc64/conf/INSTALL:1.26 Fri Mar 12 23:07:13 2010 +++ src/sys/arch/sparc64/conf/INSTALL Sat May 22 15:55:41 2010 @@ -1,12 +1,12 @@ -# $NetBSD: INSTALL,v 1.26 2010/03/12 23:07:13 martin Exp $ +# $NetBSD: INSTALL,v 1.27 2010/05/22 15:55:41 tsutsui Exp $ # # NOTE: this file only needs *additional* things for the install -# kernel, that are not already included in GENERIC32! +# kernel, that are not already included in GENERIC! # See the include below... include "arch/sparc64/conf/GENERIC" -#ident "INSTALL-$Revision: 1.26 $" +#ident "INSTALL-$Revision: 1.27 $" makeoptions COPTS="-Os"
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: macallan Date: Tue Sep 21 03:26:20 UTC 2010 Modified Files: src/sys/arch/sparc64/conf: files.sparc64 Log Message: defflag some flags for the ffb driver To generate a diff of this commit: cvs rdiff -u -r1.127 -r1.128 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/files.sparc64 diff -u src/sys/arch/sparc64/conf/files.sparc64:1.127 src/sys/arch/sparc64/conf/files.sparc64:1.128 --- src/sys/arch/sparc64/conf/files.sparc64:1.127 Sat Mar 6 23:26:10 2010 +++ src/sys/arch/sparc64/conf/files.sparc64 Tue Sep 21 03:26:20 2010 @@ -1,4 +1,4 @@ -# $NetBSD: files.sparc64,v 1.127 2010/03/06 23:26:10 mrg Exp $ +# $NetBSD: files.sparc64,v 1.128 2010/09/21 03:26:20 macallan Exp $ # @(#)files.sparc64 8.1 (Berkeley) 7/19/93 # sparc64-specific configuration info @@ -165,7 +165,7 @@ device ffb: wsemuldisplaydev, rasops8, rasops32, fb, vcons file arch/sparc64/dev/ffb.c ffb - +defflag opt_ffb.h FFB_DEBUG FFB_SYNC attach ffb at mainbus,upa with ffb_mainbus file arch/sparc64/dev/ffb_mainbus.c ffb_mainbus
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: mrg Date: Wed Dec 8 08:43:34 UTC 2010 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: add dbcool(4) - there are two of them on the SB2500. fix a spelling error. To generate a diff of this commit: cvs rdiff -u -r1.130 -r1.131 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.130 src/sys/arch/sparc64/conf/GENERIC:1.131 --- src/sys/arch/sparc64/conf/GENERIC:1.130 Tue Nov 23 11:14:06 2010 +++ src/sys/arch/sparc64/conf/GENERIC Wed Dec 8 08:43:34 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.130 2010/11/23 11:14:06 hannken Exp $ +# $NetBSD: GENERIC,v 1.131 2010/12/08 08:43:34 mrg Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.130 $" +#ident "GENERIC-$Revision: 1.131 $" maxusers 64 @@ -926,7 +926,8 @@ admtemp* at iic? addr? ecadc* at iic? addr? # envctrl/envctrltwo on E250/E450 lmtemp* at iic? addr? -tda* at iic? addr? # fan controll on SB1000/2000 +tda* at iic? addr? # fan control on SB1000/2000 +dbcool* at iic? addr? # SB25000 ### Other pseudo-devices
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: martin Date: Sat Dec 11 14:30:12 UTC 2010 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Add bnx @ pci To generate a diff of this commit: cvs rdiff -u -r1.131 -r1.132 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.131 src/sys/arch/sparc64/conf/GENERIC:1.132 --- src/sys/arch/sparc64/conf/GENERIC:1.131 Wed Dec 8 08:43:34 2010 +++ src/sys/arch/sparc64/conf/GENERIC Sat Dec 11 14:30:12 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.131 2010/12/08 08:43:34 mrg Exp $ +# $NetBSD: GENERIC,v 1.132 2010/12/11 14:30:12 martin Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.131 $" +#ident "GENERIC-$Revision: 1.132 $" maxusers 64 @@ -100,13 +100,13 @@ ## 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" +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 +options DIAGNOSTIC # extra kernel sanity checking ## Enable (possibly expensive) debugging code that may also display messages ## on the system console @@ -487,6 +487,7 @@ an* at pci? dev ? function ? # Aironet PC4500/PC4800 (802.11) UT ath* at pci? dev ? function ? # Atheros 5210/5211/5212 802.11 UT bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet +bnx* at pci? dev ? function ? # Broadcom NetXtreme II Ethernet cas* at pci? dev ? function ? # Sun Cassini/Cassini+ Ethernet en* at pci? dev ? function ? # ENI/Adaptec ATM UT # XXX causes ICE
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: macallan Date: Wed Oct 28 03:41:31 UTC 2009 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: add radeonfb ( has been working for ages with my XVR-100 ) and pm2fb ( for PGX32 / TechSource Raptor GFX 8P ) We should probably enable cgthree as well since it grew wsdisplay support a while ago. To generate a diff of this commit: cvs rdiff -u -r1.111 -r1.112 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.111 src/sys/arch/sparc64/conf/GENERIC:1.112 --- src/sys/arch/sparc64/conf/GENERIC:1.111 Fri Oct 2 15:09:16 2009 +++ src/sys/arch/sparc64/conf/GENERIC Wed Oct 28 03:41:30 2009 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.111 2009/10/02 15:09:16 nakayama Exp $ +# $NetBSD: GENERIC,v 1.112 2009/10/28 03:41:30 macallan Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.111 $" +#ident "GENERIC-$Revision: 1.112 $" maxusers 64 @@ -857,6 +857,12 @@ # On board vga on U5/U10 etc. machfb* at pci? +# Sun XVR-100 +radeonfb* at pci? + +# Sun PGX32 / TechSource Raptor GFX 8P +pm2fb* at pci? + # generic PCI framebuffers genfb* at pci?
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: macallan Date: Thu Nov 26 02:03:43 UTC 2009 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: cgthree works on sparc64 so let's enable it for those poor souls who can't find at least a CG6 To generate a diff of this commit: cvs rdiff -u -r1.112 -r1.113 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.112 src/sys/arch/sparc64/conf/GENERIC:1.113 --- src/sys/arch/sparc64/conf/GENERIC:1.112 Wed Oct 28 03:41:30 2009 +++ src/sys/arch/sparc64/conf/GENERIC Thu Nov 26 02:03:42 2009 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.112 2009/10/28 03:41:30 macallan Exp $ +# $NetBSD: GENERIC,v 1.113 2009/11/26 02:03:42 macallan Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.112 $" +#ident "GENERIC-$Revision: 1.113 $" maxusers 64 @@ -845,8 +845,8 @@ #bwtwo* at sbus? slot ? offset ? ## Sun "cgthree" Sbus color framebuffer -#cgthree0 at sbus? slot ? offset ? -#cgthree* at sbus? slot ? offset ? +cgthree0 at sbus? slot ? offset ? +cgthree* at sbus? slot ? offset ? ## Sun "cgsix" accelerated color framebuffer. cgsix* at sbus? slot ? offset ?
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: mrg Date: Sat Nov 28 21:39:42 UTC 2009 Added Files: src/sys/arch/sparc64/conf: SCHIZO Log Message: add the kernel config i've been mostly using for USIII/schizo support To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/sparc64/conf/SCHIZO Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/sparc64/conf/SCHIZO diff -u /dev/null src/sys/arch/sparc64/conf/SCHIZO:1.1 --- /dev/null Sat Nov 28 21:39:42 2009 +++ src/sys/arch/sparc64/conf/SCHIZO Sat Nov 28 21:39:42 2009 @@ -0,0 +1,28 @@ +# $NetBSD: SCHIZO,v 1.1 2009/11/28 21:39:42 mrg Exp $ +# +# GENERIC with schizo support enabled, with the annoying schizo interupt +# option +# + +#include "arch/sparc64/conf/GENERIC.MP" +include "arch/sparc64/conf/GENERIC" + +#ident "SCHIZO.$Revision: 1.1 $" + +options SCHIZO_BUS_SPACE_BROKEN +#options SYSCALL_DEBUG + +makeoptions DEBUG="-g" +options DEBUG +options DIAGNOSTIC +options DB_MAX_WIDTH=160 +options DDB_ONPANIC=2 # print stack trace + +schizo* at mainbus? +pci* at schizo? + +no machfb +no esiop +no siop + +bge* at pci? dev ? function ?
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: mrg Date: Thu Dec 3 03:30:03 UTC 2009 Modified Files: src/sys/arch/sparc64/conf: SCHIZO Log Message: base this on GENERIC.MP. seems just as stable. turn on esiop/siop now that their interrupts match. turn off admtemp, since we get a false match. XXX admtemp_match needs help. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc64/conf/SCHIZO 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/SCHIZO diff -u src/sys/arch/sparc64/conf/SCHIZO:1.1 src/sys/arch/sparc64/conf/SCHIZO:1.2 --- src/sys/arch/sparc64/conf/SCHIZO:1.1 Sat Nov 28 21:39:42 2009 +++ src/sys/arch/sparc64/conf/SCHIZO Thu Dec 3 03:30:02 2009 @@ -1,16 +1,15 @@ -# $NetBSD: SCHIZO,v 1.1 2009/11/28 21:39:42 mrg Exp $ +# $NetBSD: SCHIZO,v 1.2 2009/12/03 03:30:02 mrg Exp $ # # GENERIC with schizo support enabled, with the annoying schizo interupt # option # -#include "arch/sparc64/conf/GENERIC.MP" -include "arch/sparc64/conf/GENERIC" +include "arch/sparc64/conf/GENERIC.MP" +#include "arch/sparc64/conf/GENERIC" -#ident "SCHIZO.$Revision: 1.1 $" +#ident "SCHIZO.$Revision: 1.2 $" options SCHIZO_BUS_SPACE_BROKEN -#options SYSCALL_DEBUG makeoptions DEBUG="-g" options DEBUG @@ -21,8 +20,11 @@ schizo* at mainbus? pci* at schizo? +# this crashes when attaching. no machfb -no esiop -no siop +# this doesn't work yet bge* at pci? dev ? function ? + +# this matches when it isn't present. ugh. +no admtemp
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: macallan Date: Tue Dec 29 06:56:41 UTC 2009 Modified Files: src/sys/arch/sparc64/conf: files.sparc64 Log Message: add gfb at mainbus To generate a diff of this commit: cvs rdiff -u -r1.121 -r1.122 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/files.sparc64 diff -u src/sys/arch/sparc64/conf/files.sparc64:1.121 src/sys/arch/sparc64/conf/files.sparc64:1.122 --- src/sys/arch/sparc64/conf/files.sparc64:1.121 Fri Oct 2 15:09:16 2009 +++ src/sys/arch/sparc64/conf/files.sparc64 Tue Dec 29 06:56:41 2009 @@ -1,4 +1,4 @@ -# $NetBSD: files.sparc64,v 1.121 2009/10/02 15:09:16 nakayama Exp $ +# $NetBSD: files.sparc64,v 1.122 2009/12/29 06:56:41 macallan Exp $ # @(#)files.sparc64 8.1 (Berkeley) 7/19/93 # sparc64-specific configuration info @@ -150,12 +150,16 @@ attach cgfourteen at sbus file arch/sparc64/dev/cgfourteen.c cgfourteen needs-flag -device ffb: wsemuldisplaydev, rasops8, rasops16, rasops24, rasops32, fb, vcons +device ffb: wsemuldisplaydev, rasops8, rasops32, fb, vcons file arch/sparc64/dev/ffb.c ffb attach ffb at mainbus with ffb_mainbus file arch/sparc64/dev/ffb_mainbus.c ffb_mainbus +device gfb: wsemuldisplaydev, rasops32, fb, vcons +file arch/sparc64/dev/gfb.c gfb +attach gfb at mainbus + # CP1500/1400 watchdog timer device pldwdog: sysmon_wdog attach pldwdog at ebus
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: macallan Date: Tue Dec 29 07:00:42 UTC 2009 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: add gfb at mainbus To generate a diff of this commit: cvs rdiff -u -r1.114 -r1.115 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.114 src/sys/arch/sparc64/conf/GENERIC:1.115 --- src/sys/arch/sparc64/conf/GENERIC:1.114 Sat Dec 5 20:11:17 2009 +++ src/sys/arch/sparc64/conf/GENERIC Tue Dec 29 07:00:42 2009 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.114 2009/12/05 20:11:17 pooka Exp $ +# $NetBSD: GENERIC,v 1.115 2009/12/29 07:00:42 macallan Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.114 $" +#ident "GENERIC-$Revision: 1.115 $" maxusers 64 @@ -854,6 +854,9 @@ ## Sun FFB ffb* at mainbus0 +## Sun XVR-1000 +gfb* at mainbus0 + # On board vga on U5/U10 etc. machfb* at pci?
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: martin Date: Thu Dec 16 09:35:31 UTC 2010 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Ooops, backout intended part of previous change, pointed out by Masao Uebayashi. To generate a diff of this commit: cvs rdiff -u -r1.132 -r1.133 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.132 src/sys/arch/sparc64/conf/GENERIC:1.133 --- src/sys/arch/sparc64/conf/GENERIC:1.132 Sat Dec 11 14:30:12 2010 +++ src/sys/arch/sparc64/conf/GENERIC Thu Dec 16 09:35:31 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.132 2010/12/11 14:30:12 martin Exp $ +# $NetBSD: GENERIC,v 1.133 2010/12/16 09:35:31 martin Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.132 $" +#ident "GENERIC-$Revision: 1.133 $" maxusers 64 @@ -100,13 +100,13 @@ ## 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" +#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 +#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/sparc64/conf
Module Name:src Committed By: jnemeth Date: Wed Jan 5 10:34:49 UTC 2011 Added Files: src/sys/arch/sparc64/conf: MODULAR Log Message: Sample MODULAR kernel configuration. approved by: martin@ To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/sparc64/conf/MODULAR Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/sparc64/conf/MODULAR diff -u /dev/null src/sys/arch/sparc64/conf/MODULAR:1.1 --- /dev/null Wed Jan 5 10:34:49 2011 +++ src/sys/arch/sparc64/conf/MODULAR Wed Jan 5 10:34:49 2011 @@ -0,0 +1,34 @@ +# $NetBSD: MODULAR,v 1.1 2011/01/05 10:34:49 jnemeth Exp $ +# +# MODULAR kernel - like GENERIC, but excluding lots of stuff that can +# be loaded as a module later +# + +include "arch/sparc64/conf/GENERIC" + +#ident "MODULAR-$Revision: 1.1 $" + +#no options MODULAR + +#no options EXEC_AOUT # execve(2) support for a.out binaries +#no options EXEC_ELF32 # Exec module for SunOS 5.x binaries. + +#no options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. +no options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. + +no file-system KERNFS # kernel data-structure filesystem +no file-system NULLFS # NULL layered filesystem +no file-system OVERLAY # overlay file system +no file-system MFS # memory-based filesystem +no file-system FDESC # user file descriptor filesystem +no file-system UMAPFS # uid/gid remapping filesystem +no file-system LFS # Log-based filesystem (still experimental) +no file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs) +no file-system PROCFS # /proc +no file-system CD9660 # ISO 9660 + Rock Ridge file system +no file-system UNION # union file system +no file-system MSDOSFS # MS-DOS FAT filesystem(s). +no file-system PTYFS # /dev/pts/N support +no file-system SMBFS # experimental - CIFS; also needs nsmb (below) +no file-system TMPFS # Efficient memory file-system +#no file-system UDF # experimental - OSTA UDF CD/DVD file-system
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: martin Date: Wed Jan 5 12:59:33 UTC 2011 Modified Files: src/sys/arch/sparc64/conf: MODULAR Log Message: Untill modules are first class citizens, we need to run MODULAR kernels insecure. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc64/conf/MODULAR 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/MODULAR diff -u src/sys/arch/sparc64/conf/MODULAR:1.1 src/sys/arch/sparc64/conf/MODULAR:1.2 --- src/sys/arch/sparc64/conf/MODULAR:1.1 Wed Jan 5 10:34:49 2011 +++ src/sys/arch/sparc64/conf/MODULAR Wed Jan 5 12:59:33 2011 @@ -1,4 +1,4 @@ -# $NetBSD: MODULAR,v 1.1 2011/01/05 10:34:49 jnemeth Exp $ +# $NetBSD: MODULAR,v 1.2 2011/01/05 12:59:33 martin Exp $ # # MODULAR kernel - like GENERIC, but excluding lots of stuff that can # be loaded as a module later @@ -6,9 +6,10 @@ include "arch/sparc64/conf/GENERIC" -#ident "MODULAR-$Revision: 1.1 $" +#ident "MODULAR-$Revision: 1.2 $" -#no options MODULAR +options INSECURE # disable kernel security levels initially +# (we can't load file system modules otherwise) #no options EXEC_AOUT # execve(2) support for a.out binaries #no options EXEC_ELF32 # Exec module for SunOS 5.x binaries.
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: martin Date: Wed Jan 5 13:29:27 UTC 2011 Modified Files: src/sys/arch/sparc64/conf: MODULAR Log Message: Duh, actually make it modular To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sparc64/conf/MODULAR 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/MODULAR diff -u src/sys/arch/sparc64/conf/MODULAR:1.2 src/sys/arch/sparc64/conf/MODULAR:1.3 --- src/sys/arch/sparc64/conf/MODULAR:1.2 Wed Jan 5 12:59:33 2011 +++ src/sys/arch/sparc64/conf/MODULAR Wed Jan 5 13:29:27 2011 @@ -1,4 +1,4 @@ -# $NetBSD: MODULAR,v 1.2 2011/01/05 12:59:33 martin Exp $ +# $NetBSD: MODULAR,v 1.3 2011/01/05 13:29:27 martin Exp $ # # MODULAR kernel - like GENERIC, but excluding lots of stuff that can # be loaded as a module later @@ -6,8 +6,9 @@ include "arch/sparc64/conf/GENERIC" -#ident "MODULAR-$Revision: 1.2 $" +#ident "MODULAR-$Revision: 1.3 $" +options MODULAR # allow loading of kernel modules options INSECURE # disable kernel security levels initially # (we can't load file system modules otherwise)
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: jdc Date: Fri Dec 7 12:57:02 UTC 2012 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Add uthum (tested on U60 with Belkin F5U508 USB 2 and SB2000 built-in USB 1). To generate a diff of this commit: cvs rdiff -u -r1.155 -r1.156 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.155 src/sys/arch/sparc64/conf/GENERIC:1.156 --- src/sys/arch/sparc64/conf/GENERIC:1.155 Fri Nov 2 17:51:03 2012 +++ src/sys/arch/sparc64/conf/GENERIC Fri Dec 7 12:57:01 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.155 2012/11/02 17:51:03 jdc Exp $ +# $NetBSD: GENERIC,v 1.156 2012/12/07 12:57:01 jdc 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.155 $" +#ident "GENERIC-$Revision: 1.156 $" maxusers 64 @@ -593,6 +593,9 @@ wsmouse* at uep? mux 0 ukbd* at uhidev? reportid ? wskbd* at ukbd? console ? mux 1 +# USB TEMPer and TEMPerHUM +uthum* at uhidev? reportid ? + # USB serial adapter ucycom* at uhidev? reportid ?
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: jdc Date: Fri Feb 8 15:20:17 UTC 2013 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Add seeprom(4). Tested on Blade 2000 and Fire 280R. To generate a diff of this commit: cvs rdiff -u -r1.156 -r1.157 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.156 src/sys/arch/sparc64/conf/GENERIC:1.157 --- src/sys/arch/sparc64/conf/GENERIC:1.156 Fri Dec 7 12:57:01 2012 +++ src/sys/arch/sparc64/conf/GENERIC Fri Feb 8 15:20:17 2013 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.156 2012/12/07 12:57:01 jdc Exp $ +# $NetBSD: GENERIC,v 1.157 2013/02/08 15:20:17 jdc 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.156 $" +#ident "GENERIC-$Revision: 1.157 $" maxusers 64 @@ -952,6 +952,7 @@ ecadc* at iic? addr? # envctrl/envctrlt lmtemp* at iic? addr? tda* at iic? addr? # fan control on SB1000/2000 dbcool* at iic? addr? # SB25000 +seeprom* at iic? addr? # i2c-at24c64 fru's ### Other pseudo-devices
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: nakayama Date: Tue Oct 4 10:35:33 UTC 2011 Modified Files: src/sys/arch/sparc64/conf: files.sparc64 Log Message: Make ffb(4) buildable without iic(4) driver. To generate a diff of this commit: cvs rdiff -u -r1.135 -r1.136 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/files.sparc64 diff -u src/sys/arch/sparc64/conf/files.sparc64:1.135 src/sys/arch/sparc64/conf/files.sparc64:1.136 --- src/sys/arch/sparc64/conf/files.sparc64:1.135 Mon Aug 1 10:18:23 2011 +++ src/sys/arch/sparc64/conf/files.sparc64 Tue Oct 4 10:35:33 2011 @@ -1,4 +1,4 @@ -# $NetBSD: files.sparc64,v 1.135 2011/08/01 10:18:23 mrg Exp $ +# $NetBSD: files.sparc64,v 1.136 2011/10/04 10:35:33 nakayama Exp $ # @(#)files.sparc64 8.1 (Berkeley) 7/19/93 # sparc64-specific configuration info @@ -183,7 +183,7 @@ device cgfourteen attach cgfourteen at sbus file arch/sparc64/dev/cgfourteen.c cgfourteen needs-flag -device ffb: wsemuldisplaydev, rasops8, rasops32, fb, vcons, i2cbus, iic, i2c_bitbang, ddc_read_edid, edid, videomode +device ffb: wsemuldisplaydev, rasops8, rasops32, fb, vcons, i2cexec, i2c_bitbang, ddc_read_edid, edid, videomode file arch/sparc64/dev/ffb.c ffb defflag opt_ffb.h FFB_DEBUG FFB_SYNC attach ffb at mainbus,upa with ffb_mainbus
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: martin Date: Sat Jul 23 19:14:37 UTC 2011 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Enable DIAGNOSTIC by default To generate a diff of this commit: cvs rdiff -u -r1.139 -r1.140 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.139 src/sys/arch/sparc64/conf/GENERIC:1.140 --- src/sys/arch/sparc64/conf/GENERIC:1.139 Tue May 17 07:57:02 2011 +++ src/sys/arch/sparc64/conf/GENERIC Sat Jul 23 19:14:37 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.139 2011/05/17 07:57:02 martin Exp $ +# $NetBSD: GENERIC,v 1.140 2011/07/23 19:14:37 martin Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.139 $" +#ident "GENERIC-$Revision: 1.140 $" maxusers 64 @@ -105,7 +105,7 @@ ## 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/sparc64/conf
Module Name:src
Committed By: mrg
Date: Mon Aug 1 10:18:23 UTC 2011
Modified Files:
src/sys/arch/sparc64/conf: files.sparc64
Log Message:
fix the zx@fhc attachment.
To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 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/files.sparc64
diff -u src/sys/arch/sparc64/conf/files.sparc64:1.134 src/sys/arch/sparc64/conf/files.sparc64:1.135
--- src/sys/arch/sparc64/conf/files.sparc64:1.134 Fri Jul 29 08:37:37 2011
+++ src/sys/arch/sparc64/conf/files.sparc64 Mon Aug 1 10:18:23 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.sparc64,v 1.134 2011/07/29 08:37:37 mrg Exp $
+# $NetBSD: files.sparc64,v 1.135 2011/08/01 10:18:23 mrg Exp $
# @(#)files.sparc64 8.1 (Berkeley) 7/19/93
# sparc64-specific configuration info
@@ -139,7 +139,8 @@
#
device zs {channel = -1}
-attach zs at sbus, fhc
+attach zs at sbus
+attach zs at fhc with zs_fhc
file arch/sparc64/dev/zs.c zs needs-flag
file dev/ic/z8530sc.c zs
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: jakllsch Date: Sun Aug 7 14:00:08 UTC 2011 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Trailing whitespace, what trailing whitespace? To generate a diff of this commit: cvs rdiff -u -r1.142 -r1.143 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.142 src/sys/arch/sparc64/conf/GENERIC:1.143 --- src/sys/arch/sparc64/conf/GENERIC:1.142 Fri Jul 29 08:37:37 2011 +++ src/sys/arch/sparc64/conf/GENERIC Sun Aug 7 14:00:08 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.142 2011/07/29 08:37:37 mrg Exp $ +# $NetBSD: GENERIC,v 1.143 2011/08/07 14:00:08 jakllsch Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.142 $" +#ident "GENERIC-$Revision: 1.143 $" maxusers 64 @@ -432,7 +432,7 @@ ## A disk-like interface to files. Can be used to create floppy, CD, ## miniroot images, etc. -pseudo-device vnd +pseudo-device vnd #options VND_COMPRESSION # compressed vnd(4) ## Concatenated and striped disks; with this, you can create a software-based @@ -461,7 +461,7 @@ ## Memory disk device, used on boot floppies with compressed ## kernel-plus-root-disk images. -pseudo-device md +pseudo-device md Network interfaces @@ -692,20 +692,20 @@ pseudo-device loop ## SLIP and CSLIP interfaces, for IP over a serial line. -pseudo-device sl +pseudo-device sl ## PPP, the successor to SLIP. See pppd(8). -pseudo-device ppp +pseudo-device ppp ## PPP over Ethernet (RFC 2516) pseudo-device pppoe ## Starmode Radio IP, a special hardware network device. -pseudo-device strip +pseudo-device strip ## Network "tunnel" device, allowing protocol stacks to run in the userland. ## This is used by the third-party user-mode "ppp" program, and others. -pseudo-device tun +pseudo-device tun pseudo-device tap # virtual Ethernet ## Generic L3 over IP tunnel
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: mrg Date: Fri Aug 12 06:55:46 UTC 2011 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: add auacer, present on the ultra45. To generate a diff of this commit: cvs rdiff -u -r1.143 -r1.144 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.143 src/sys/arch/sparc64/conf/GENERIC:1.144 --- src/sys/arch/sparc64/conf/GENERIC:1.143 Sun Aug 7 14:00:08 2011 +++ src/sys/arch/sparc64/conf/GENERIC Fri Aug 12 06:55:45 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.143 2011/08/07 14:00:08 jakllsch Exp $ +# $NetBSD: GENERIC,v 1.144 2011/08/12 06:55:45 mrg Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.143 $" +#ident "GENERIC-$Revision: 1.144 $" maxusers 64 @@ -860,6 +860,7 @@ audiocs* at sbus? slot ? offset ? # SUNW,CS4231 audiocs* at ebus? # SUNW,CS4231 in U5/U10 autri* at pci? dev ? function ? # Blade 100 'sound' +auacer* at pci? dev ? function ? # Ultra45 audio* at audiobus?
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: nakayama Date: Sun Mar 11 06:11:29 UTC 2012 Modified Files: src/sys/arch/sparc64/conf: GENERIC NONPLUS64 Log Message: Remove stray comments for LKM. To generate a diff of this commit: cvs rdiff -u -r1.149 -r1.150 src/sys/arch/sparc64/conf/GENERIC cvs rdiff -u -r1.34 -r1.35 src/sys/arch/sparc64/conf/NONPLUS64 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.149 src/sys/arch/sparc64/conf/GENERIC:1.150 --- src/sys/arch/sparc64/conf/GENERIC:1.149 Sat Mar 10 21:51:56 2012 +++ src/sys/arch/sparc64/conf/GENERIC Sun Mar 11 06:11:29 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.149 2012/03/10 21:51:56 joerg Exp $ +# $NetBSD: GENERIC,v 1.150 2012/03/11 06:11:29 nakayama 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.149 $" +#ident "GENERIC-$Revision: 1.150 $" maxusers 64 @@ -60,8 +60,6 @@ options SYSVMSG # System V message que 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 @@ -203,7 +201,7 @@ options PIM # Protocol Independent Mul 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/sparc64/conf/NONPLUS64 diff -u src/sys/arch/sparc64/conf/NONPLUS64:1.34 src/sys/arch/sparc64/conf/NONPLUS64:1.35 --- src/sys/arch/sparc64/conf/NONPLUS64:1.34 Tue Nov 22 21:25:38 2011 +++ src/sys/arch/sparc64/conf/NONPLUS64 Sun Mar 11 06:11:29 2012 @@ -1,8 +1,8 @@ -# $NetBSD: NONPLUS64,v 1.34 2011/11/22 21:25:38 tls Exp $ +# $NetBSD: NONPLUS64,v 1.35 2012/03/11 06:11:29 nakayama Exp $ include "arch/sparc64/conf/std.sparc64" -#ident "NONPLUS64-$Revision: 1.34 $" +#ident "NONPLUS64-$Revision: 1.35 $" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary @@ -45,8 +45,6 @@ options SYSVMSG # System V message que 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 @@ -172,7 +170,7 @@ options ISO,TPIP # OSI networking 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
CVS commit: src/sys/arch/sparc64/conf
Module Name:src
Committed By: mrg
Date: Sun Mar 20 20:55:46 UTC 2011
Modified Files:
src/sys/arch/sparc64/conf: files.sparc64
Log Message:
add pci@pryo@mainbus and ebus@mainbus support.
To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 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/files.sparc64
diff -u src/sys/arch/sparc64/conf/files.sparc64:1.128 src/sys/arch/sparc64/conf/files.sparc64:1.129
--- src/sys/arch/sparc64/conf/files.sparc64:1.128 Tue Sep 21 03:26:20 2010
+++ src/sys/arch/sparc64/conf/files.sparc64 Sun Mar 20 20:55:46 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.sparc64,v 1.128 2010/09/21 03:26:20 macallan Exp $
+# $NetBSD: files.sparc64,v 1.129 2011/03/20 20:55:46 mrg Exp $
# @(#)files.sparc64 8.1 (Berkeley) 7/19/93
# sparc64-specific configuration info
@@ -34,19 +34,24 @@
attach psycho at mainbus
device schizo: pcibus, sysmon_power, sysmon_taskq
attach schizo at mainbus
+device pyro: pcibus, sysmon_power, sysmon_taskq
+attach pyro at mainbus
include "dev/pci/files.pci"
file arch/sparc64/dev/psycho.c psycho
file arch/sparc64/dev/schizo.c schizo
-file arch/sparc64/dev/pci_machdep.c psycho | schizo
+file arch/sparc64/dev/pyro.c pyro
+file arch/sparc64/dev/pci_machdep.c psycho | schizo | pyro
# IOMMU is for both
-file arch/sparc64/dev/iommu.c sbus | psycho | schizo
+file arch/sparc64/dev/iommu.c sbus | psycho | schizo | pyro
include "dev/ata/files.ata"
device ebus {[addr = -1]}: pcibus
attach ebus at pci
file arch/sparc64/dev/ebus.c ebus
+attach ebus at mainbus with ebus_mainbus
+file arch/sparc64/dev/ebus_mainbus.c ebus_mainbus
device clock: mk48txx
attach clock at sbus with mkclock_sbus
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: mrg Date: Sun Mar 20 23:31:36 UTC 2011 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: enable pci@pryo@mainbus and ebus@mainbus attachments. pryo still isn't fully working, but i'm able to talk to disk and com properly. bge, ohci/ehci, aceride and wm (pcie card) interrupts are not working yet. To generate a diff of this commit: cvs rdiff -u -r1.134 -r1.135 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.134 src/sys/arch/sparc64/conf/GENERIC:1.135 --- src/sys/arch/sparc64/conf/GENERIC:1.134 Sun Mar 6 17:08:31 2011 +++ src/sys/arch/sparc64/conf/GENERIC Sun Mar 20 23:31:36 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.134 2011/03/06 17:08:31 bouyer Exp $ +# $NetBSD: GENERIC,v 1.135 2011/03/20 23:31:36 mrg Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.134 $" +#ident "GENERIC-$Revision: 1.135 $" maxusers 64 @@ -240,10 +240,13 @@ sbus* at mainbus0# SBus-based systems psycho* at mainbus0# PCI-based systems schizo* at mainbus? +pyro* at mainbus? pci* at psycho? pci* at schizo? +pci* at pyro? pci* at ppb? ppb* at pci? # `APB' support. +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
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: martin Date: Mon Apr 4 10:25:09 UTC 2011 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Add gem at sbus (works since quite some time). To generate a diff of this commit: cvs rdiff -u -r1.135 -r1.136 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.135 src/sys/arch/sparc64/conf/GENERIC:1.136 --- src/sys/arch/sparc64/conf/GENERIC:1.135 Sun Mar 20 23:31:36 2011 +++ src/sys/arch/sparc64/conf/GENERIC Mon Apr 4 10:25:08 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.135 2011/03/20 23:31:36 mrg Exp $ +# $NetBSD: GENERIC,v 1.136 2011/04/04 10:25:08 martin Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.135 $" +#ident "GENERIC-$Revision: 1.136 $" maxusers 64 @@ -502,6 +502,7 @@ fpa* at pci? dev ? function ? # DEC DEFPA FDDI UT fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B gem* at pci? dev ? function ? # Apple GMAC and Sun ERI gigabit enet +gem* at sbus? slot ? offset ? # XXX lacks bus_dmamap_sync() #le* at pci? dev ? function ? # PCnet-PCI Ethernet # XXX uses vtophys()
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: mrg Date: Thu May 12 07:06:01 UTC 2011 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: remove a sparc-specific comment. To generate a diff of this commit: cvs rdiff -u -r1.136 -r1.137 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.136 src/sys/arch/sparc64/conf/GENERIC:1.137 --- src/sys/arch/sparc64/conf/GENERIC:1.136 Mon Apr 4 10:25:08 2011 +++ src/sys/arch/sparc64/conf/GENERIC Thu May 12 07:06:00 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.136 2011/04/04 10:25:08 martin Exp $ +# $NetBSD: GENERIC,v 1.137 2011/05/12 07:06:00 mrg Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.136 $" +#ident "GENERIC-$Revision: 1.137 $" maxusers 64 @@ -30,7 +30,6 @@ # Options for variants of the Sun SPARC architecure. -# We currently support three architecture types; at least one is required. options SUN4U # sun4u - UltraSPARC #options BLINK # blink the system LED
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: martin Date: Tue May 17 07:57:02 UTC 2011 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Disable DEBUG=-g by default again (accidently slipped in with last changes). Ok: mrg To generate a diff of this commit: cvs rdiff -u -r1.138 -r1.139 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.138 src/sys/arch/sparc64/conf/GENERIC:1.139 --- src/sys/arch/sparc64/conf/GENERIC:1.138 Tue May 17 04:18:05 2011 +++ src/sys/arch/sparc64/conf/GENERIC Tue May 17 07:57:02 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.138 2011/05/17 04:18:05 mrg Exp $ +# $NetBSD: GENERIC,v 1.139 2011/05/17 07:57:02 martin Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.138 $" +#ident "GENERIC-$Revision: 1.139 $" maxusers 64 @@ -99,7 +99,7 @@ ## 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" +#makeoptions DEBUG="-g" ## Adds code to the kernel that does internal consistency checks, and will
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: mrg Date: Mon Jun 6 01:23:31 UTC 2011 Modified Files: src/sys/arch/sparc64/conf: files.sparc64 Log Message: sort To generate a diff of this commit: cvs rdiff -u -r1.131 -r1.132 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/files.sparc64 diff -u src/sys/arch/sparc64/conf/files.sparc64:1.131 src/sys/arch/sparc64/conf/files.sparc64:1.132 --- src/sys/arch/sparc64/conf/files.sparc64:1.131 Mon Jun 6 01:16:48 2011 +++ src/sys/arch/sparc64/conf/files.sparc64 Mon Jun 6 01:23:31 2011 @@ -1,4 +1,4 @@ -# $NetBSD: files.sparc64,v 1.131 2011/06/06 01:16:48 mrg Exp $ +# $NetBSD: files.sparc64,v 1.132 2011/06/06 01:23:31 mrg Exp $ # @(#)files.sparc64 8.1 (Berkeley) 7/19/93 # sparc64-specific configuration info @@ -205,8 +205,8 @@ file arch/sparc/sparc/promlib.c file arch/sparc64/sparc64/autoconf.c -file arch/sparc64/sparc64/clock.c file arch/sparc64/sparc64/cache.c +file arch/sparc64/sparc64/clock.c file arch/sparc64/sparc64/core_machdep.c coredump file arch/sparc64/sparc64/emul.c file arch/sparc64/sparc64/intr.c
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: martin Date: Sun Dec 25 10:37:15 UTC 2011 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Enable cgd(4) To generate a diff of this commit: cvs rdiff -u -r1.146 -r1.147 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.146 src/sys/arch/sparc64/conf/GENERIC:1.147 --- src/sys/arch/sparc64/conf/GENERIC:1.146 Sun Dec 18 05:49:32 2011 +++ src/sys/arch/sparc64/conf/GENERIC Sun Dec 25 10:37:14 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.146 2011/12/18 05:49:32 dholland Exp $ +# $NetBSD: GENERIC,v 1.147 2011/12/25 10:37:14 martin 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.146 $" +#ident "GENERIC-$Revision: 1.147 $" maxusers 64 @@ -442,7 +442,7 @@ pseudo-device ccd 4 ## Cryptographic disk devices. See cgd(4). -#pseudo-device cgd 4 +pseudo-device cgd 4 ## RAIDframe disk driver: software RAID driver. See raid(4).
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: martin Date: Mon Dec 26 19:33:20 UTC 2011 Modified Files: src/sys/arch/sparc64/conf: GENERIC.DEBUG Log Message: DIAGNOSTIC is enabled in GENERIC already, don't do it again here To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc64/conf/GENERIC.DEBUG 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.DEBUG diff -u src/sys/arch/sparc64/conf/GENERIC.DEBUG:1.1 src/sys/arch/sparc64/conf/GENERIC.DEBUG:1.2 --- src/sys/arch/sparc64/conf/GENERIC.DEBUG:1.1 Sat Mar 13 08:36:06 2010 +++ src/sys/arch/sparc64/conf/GENERIC.DEBUG Mon Dec 26 19:33:20 2011 @@ -1,15 +1,15 @@ -# $NetBSD: GENERIC.DEBUG,v 1.1 2010/03/13 08:36:06 mrg Exp $ +# $NetBSD: GENERIC.DEBUG,v 1.2 2011/12/26 19:33:20 martin Exp $ # # GENERIC with debugging support enabled. # include "arch/sparc64/conf/GENERIC" -#ident "GENERIC.DEBUG.$Revision: 1.1 $" +#ident "GENERIC.DEBUG.$Revision: 1.2 $" makeoptions DEBUG="-g" options DEBUG -options DIAGNOSTIC +# options DIAGNOSTIC # already in GENERIC options LOCKDEBUG options DB_MAX_WIDTH=160
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: jakllsch Date: Tue Jan 17 16:03:37 UTC 2012 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: +gsip(4) To generate a diff of this commit: cvs rdiff -u -r1.147 -r1.148 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.147 src/sys/arch/sparc64/conf/GENERIC:1.148 --- src/sys/arch/sparc64/conf/GENERIC:1.147 Sun Dec 25 10:37:14 2011 +++ src/sys/arch/sparc64/conf/GENERIC Tue Jan 17 16:03:37 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.147 2011/12/25 10:37:14 martin Exp $ +# $NetBSD: GENERIC,v 1.148 2012/01/17 16:03:37 jakllsch 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.147 $" +#ident "GENERIC-$Revision: 1.148 $" maxusers 64 @@ -507,6 +507,7 @@ fpa* at pci? dev ? function ? # DEC DEFP fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B gem* at pci? dev ? function ? # Apple GMAC and Sun ERI gigabit enet gem* at sbus? slot ? offset ? +gsip* at pci? dev ? function ? # National Semiconductor DP83820 GigE # XXX lacks bus_dmamap_sync() #le* at pci? dev ? function ? # PCnet-PCI Ethernet # XXX uses vtophys()
CVS commit: src/sys/arch/sparc64/conf
Module Name:src
Committed By: jdc
Date: Sat Oct 13 18:00:03 UTC 2012
Modified Files:
src/sys/arch/sparc64/conf: GENERIC files.sparc64
Log Message:
Add pckbc at ebus.
To generate a diff of this commit:
cvs rdiff -u -r1.152 -r1.153 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r1.138 -r1.139 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.152 src/sys/arch/sparc64/conf/GENERIC:1.153
--- src/sys/arch/sparc64/conf/GENERIC:1.152 Sat Sep 1 18:17:51 2012
+++ src/sys/arch/sparc64/conf/GENERIC Sat Oct 13 18:00:03 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.152 2012/09/01 18:17:51 jakllsch Exp $
+# $NetBSD: GENERIC,v 1.153 2012/10/13 18:00:03 jdc 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.152 $"
+#ident "GENERIC-$Revision: 1.153 $"
maxusers 64
@@ -297,6 +297,14 @@ com* at ebus?# `com' driver for `su'
kbd0 at com? # keyboard
ms0 at com? # mouse
+## Tadpole SPARCle PS/2 keyboard and mouse
+pckbc* at ebus?# PC keyboard controller
+pckbd* at pckbc? # PC keyboard
+pms* at pckbc? # PS/2 mouse for wsmouse
+options PMS_SYNAPTICS_TOUCHPAD # Enable support for Synaptics Touchpads
+wskbd* at pckbd? console ?
+wsmouse* at pms? mux 0
+
## Magma Serial/Parallel driver (not tested)
#magma* at sbus? slot ? offset ?
#mtty* at magma?
Index: src/sys/arch/sparc64/conf/files.sparc64
diff -u src/sys/arch/sparc64/conf/files.sparc64:1.138 src/sys/arch/sparc64/conf/files.sparc64:1.139
--- src/sys/arch/sparc64/conf/files.sparc64:1.138 Sat Mar 3 03:21:16 2012
+++ src/sys/arch/sparc64/conf/files.sparc64 Sat Oct 13 18:00:03 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.sparc64,v 1.138 2012/03/03 03:21:16 nakayama Exp $
+# $NetBSD: files.sparc64,v 1.139 2012/10/13 18:00:03 jdc Exp $
# @(#)files.sparc64 8.1 (Berkeley) 7/19/93
# sparc64-specific configuration info
@@ -153,6 +153,11 @@ file arch/sparc64/dev/sab.c sab | sabt
attach com at ebus with com_ebus
file arch/sparc64/dev/com_ebus.c com_ebus
+# ebus PS/2 keyboard attachment for Tadpole SPARCle, etc.
+include "dev/pckbport/files.pckbport"
+attach pckbc at ebus with pckbc_ebus
+file arch/sparc64/dev/pckbc_ebus.c pckbc_ebus
+
device zstty {}: tty
attach zstty at zs
file dev/ic/z8530tty.c zstty needs-flag
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: jdc Date: Fri Nov 2 17:51:03 UTC 2012 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Add indirectly configured spdmem devices for Tadpole SPARCle. To generate a diff of this commit: cvs rdiff -u -r1.154 -r1.155 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.154 src/sys/arch/sparc64/conf/GENERIC:1.155 --- src/sys/arch/sparc64/conf/GENERIC:1.154 Wed Oct 17 14:48:17 2012 +++ src/sys/arch/sparc64/conf/GENERIC Fri Nov 2 17:51:03 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.154 2012/10/17 14:48:17 apb Exp $ +# $NetBSD: GENERIC,v 1.155 2012/11/02 17:51:03 jdc 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.154 $" +#ident "GENERIC-$Revision: 1.155 $" maxusers 64 @@ -940,6 +940,9 @@ alipm* at pci? iic* at alipm? # I2C devices +spdmem* at iic? addr 0x50 # SPARCle memory +spdmem* at iic? addr 0x51 # SPARCle memory + spdmem* at iic? addr? admtemp* at iic? addr? ecadc* at iic? addr? # envctrl/envctrltwo on E250/E450
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: martin Date: Sat Mar 19 18:50:25 UTC 2016 Modified Files: src/sys/arch/sparc64/conf: Makefile.sparc64 Log Message: Default kernel builds to USE_SSP=yes. To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.82 src/sys/arch/sparc64/conf/Makefile.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/Makefile.sparc64 diff -u src/sys/arch/sparc64/conf/Makefile.sparc64:1.81 src/sys/arch/sparc64/conf/Makefile.sparc64:1.82 --- src/sys/arch/sparc64/conf/Makefile.sparc64:1.81 Sat Feb 27 19:26:14 2016 +++ src/sys/arch/sparc64/conf/Makefile.sparc64 Sat Mar 19 18:50:25 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.sparc64,v 1.81 2016/02/27 19:26:14 joerg Exp $ +# $NetBSD: Makefile.sparc64,v 1.82 2016/03/19 18:50:25 martin Exp $ #= # @@ -43,6 +43,8 @@ USETOOLS?= no NEED_OWN_INSTALL_TARGET?=no .include +USE_SSP?= yes + ## ## (1) port identification ##
CVS commit: src/sys/arch/sparc64/conf
Module Name:src
Committed By: nakayama
Date: Fri Mar 25 14:58:53 UTC 2016
Modified Files:
src/sys/arch/sparc64/conf: kern32.ldscript
Log Message:
Fix probably a typo.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sparc64/conf/kern32.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/sparc64/conf/kern32.ldscript
diff -u src/sys/arch/sparc64/conf/kern32.ldscript:1.16 src/sys/arch/sparc64/conf/kern32.ldscript:1.17
--- src/sys/arch/sparc64/conf/kern32.ldscript:1.16 Tue Aug 25 02:59:00 2015
+++ src/sys/arch/sparc64/conf/kern32.ldscript Fri Mar 25 14:58:53 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: kern32.ldscript,v 1.16 2015/08/25 02:59:00 uebayasi Exp $ */
+/* $NetBSD: kern32.ldscript,v 1.17 2016/03/25 14:58:53 nakayama Exp $ */
#undef sparc
@@ -42,7 +42,7 @@ SECTIONS
}
.data1 : { *(.data1) }
. = ALIGN(64); /* COHERENCY_UNIT */
- .data.cacheline_aligned : { *(.data_cacheline_aligned) }
+ .data.cacheline_aligned : { *(.data.cacheline_aligned) }
. = ALIGN(64); /* COHERENCY_UNIT */
.data.read_mostly : { *(.data.read_mostly) }
. = ALIGN(64); /* COHERENCY_UNIT */
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: msaitoh Date: Tue Aug 11 03:59:37 UTC 2015 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Add ixg(4). To generate a diff of this commit: cvs rdiff -u -r1.180 -r1.181 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.180 src/sys/arch/sparc64/conf/GENERIC:1.181 --- src/sys/arch/sparc64/conf/GENERIC:1.180 Thu Feb 12 04:48:37 2015 +++ src/sys/arch/sparc64/conf/GENERIC Tue Aug 11 03:59:37 2015 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.180 2015/02/12 04:48:37 palle Exp $ +# $NetBSD: GENERIC,v 1.181 2015/08/11 03:59:37 msaitoh 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.180 $" +#ident "GENERIC-$Revision: 1.181 $" maxusers 64 @@ -516,6 +516,7 @@ fxp* at pci? dev ? function ? # Intel Et gem* at pci? dev ? function ? # Apple GMAC and Sun ERI gigabit enet gem* at sbus? slot ? offset ? gsip* at pci? dev ? function ? # National Semiconductor DP83820 GigE +ixg* at pci? dev ? function ? # Intel 8259x 10 gigabit # XXX lacks bus_dmamap_sync() #le* at pci? dev ? function ? # PCnet-PCI Ethernet # XXX uses vtophys()
CVS commit: src/sys/arch/sparc64/conf
Module Name:src
Committed By: martin
Date: Sun Aug 30 18:20:27 UTC 2015
Modified Files:
src/sys/arch/sparc64/conf: Makefile.sparc64
Log Message:
We preprocess .s files, so add ${INCLUDES} to AFLAGS
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/sparc64/conf/Makefile.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/Makefile.sparc64
diff -u src/sys/arch/sparc64/conf/Makefile.sparc64:1.78 src/sys/arch/sparc64/conf/Makefile.sparc64:1.79
--- src/sys/arch/sparc64/conf/Makefile.sparc64:1.78 Mon Aug 24 14:04:25 2015
+++ src/sys/arch/sparc64/conf/Makefile.sparc64 Sun Aug 30 18:20:27 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sparc64,v 1.78 2015/08/24 14:04:25 uebayasi Exp $
+# $NetBSD: Makefile.sparc64,v 1.79 2015/08/30 18:20:27 martin Exp $
#=
#
@@ -72,7 +72,7 @@ CPPFLAGS+= -m32 -Wa,-Av8plusa -mcpu=ultr
AFLAGS+= -Wa,-Av8plusa
.endif
CFLAGS+= -mno-fpu
-AFLAGS+= -x assembler-with-cpp
+AFLAGS+= -x assembler-with-cpp ${INCLUDES}
##
## (3) libkern and compat
CVS commit: src/sys/arch/sparc64/conf
Module Name:src
Committed By: martin
Date: Mon Aug 31 08:00:44 UTC 2015
Modified Files:
src/sys/arch/sparc64/conf: Makefile.sparc64
Log Message:
Revert previous, not needed after sys/conf/Makefile.kern.inc rev. 1.215.
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/sparc64/conf/Makefile.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/Makefile.sparc64
diff -u src/sys/arch/sparc64/conf/Makefile.sparc64:1.79 src/sys/arch/sparc64/conf/Makefile.sparc64:1.80
--- src/sys/arch/sparc64/conf/Makefile.sparc64:1.79 Sun Aug 30 18:20:27 2015
+++ src/sys/arch/sparc64/conf/Makefile.sparc64 Mon Aug 31 08:00:44 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sparc64,v 1.79 2015/08/30 18:20:27 martin Exp $
+# $NetBSD: Makefile.sparc64,v 1.80 2015/08/31 08:00:44 martin Exp $
#=
#
@@ -72,7 +72,7 @@ CPPFLAGS+= -m32 -Wa,-Av8plusa -mcpu=ultr
AFLAGS+= -Wa,-Av8plusa
.endif
CFLAGS+= -mno-fpu
-AFLAGS+= -x assembler-with-cpp ${INCLUDES}
+AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: christos Date: Thu May 19 15:37:06 UTC 2016 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Turn on ASLR for sparc64 To generate a diff of this commit: cvs rdiff -u -r1.184 -r1.185 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.184 src/sys/arch/sparc64/conf/GENERIC:1.185 --- src/sys/arch/sparc64/conf/GENERIC:1.184 Sat Mar 19 19:21:03 2016 +++ src/sys/arch/sparc64/conf/GENERIC Thu May 19 11:37:06 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.184 2016/03/19 23:21:03 gdt Exp $ +# $NetBSD: GENERIC,v 1.185 2016/05/19 15:37:06 christos 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.184 $" +#ident "GENERIC-$Revision: 1.185 $" maxusers 64 @@ -1006,5 +1006,9 @@ pseudo-device nsmb # experimental - S # drvctl - needed to show device dictionary via drvctl(8) pseudo-device drvctl -#options PAX_MPROTECT=0 # PaX mprotect(2) restrictions - # (for static binaries only for now) +options PAX_ASLR_DEBUG=1# PaX ASLR debug +options PAX_SEGVGUARD=0 # PaX Segmentation fault guard +# XXX: MPROTECT is broken! +options PAX_MPROTECT=0 # PaX mprotect(2) restrictions +options PAX_MPROTECT_DEBUG=1# PaX mprotect debug +options PAX_ASLR=1 # PaX Address Space Layout Randomization
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: martin Date: Tue May 24 13:57:26 UTC 2016 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Update comment explaining why PAX_MPROTECT is disabled here To generate a diff of this commit: cvs rdiff -u -r1.185 -r1.186 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.185 src/sys/arch/sparc64/conf/GENERIC:1.186 --- src/sys/arch/sparc64/conf/GENERIC:1.185 Thu May 19 15:37:06 2016 +++ src/sys/arch/sparc64/conf/GENERIC Tue May 24 13:57:26 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.185 2016/05/19 15:37:06 christos Exp $ +# $NetBSD: GENERIC,v 1.186 2016/05/24 13:57:26 martin 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.185 $" +#ident "GENERIC-$Revision: 1.186 $" maxusers 64 @@ -1008,7 +1008,8 @@ pseudo-device drvctl options PAX_ASLR_DEBUG=1# PaX ASLR debug options PAX_SEGVGUARD=0 # PaX Segmentation fault guard -# XXX: MPROTECT is broken! +# XXX: there is no PLT format for sparc64 that cooperates with +# MPROTECT, so disable it for now options PAX_MPROTECT=0 # PaX mprotect(2) restrictions options PAX_MPROTECT_DEBUG=1# PaX mprotect debug options PAX_ASLR=1 # PaX Address Space Layout Randomization
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: nakayama Date: Wed May 25 20:00:50 UTC 2016 Modified Files: src/sys/arch/sparc64/conf: GENERIC GENERIC.DEBUG GENERIC.UP GENERIC32 GENERIC32.UP INSTALL MODULAR NONPLUS NONPLUS64 Log Message: tabify, fix indent and remove trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.186 -r1.187 src/sys/arch/sparc64/conf/GENERIC cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sparc64/conf/GENERIC.DEBUG cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc64/conf/GENERIC.UP \ src/sys/arch/sparc64/conf/GENERIC32.UP cvs rdiff -u -r1.140 -r1.141 src/sys/arch/sparc64/conf/GENERIC32 cvs rdiff -u -r1.29 -r1.30 src/sys/arch/sparc64/conf/INSTALL cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sparc64/conf/MODULAR cvs rdiff -u -r1.58 -r1.59 src/sys/arch/sparc64/conf/NONPLUS cvs rdiff -u -r1.46 -r1.47 src/sys/arch/sparc64/conf/NONPLUS64 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.186 src/sys/arch/sparc64/conf/GENERIC:1.187 --- src/sys/arch/sparc64/conf/GENERIC:1.186 Tue May 24 13:57:26 2016 +++ src/sys/arch/sparc64/conf/GENERIC Wed May 25 20:00:50 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.186 2016/05/24 13:57:26 martin Exp $ +# $NetBSD: GENERIC,v 1.187 2016/05/25 20:00:50 nakayama Exp $ # # GENERIC machine description file # @@ -18,11 +18,11 @@ # of each device driver in this file see the section 4 man page for the # device. -include "arch/sparc64/conf/std.sparc64" +include "arch/sparc64/conf/std.sparc64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.186 $" +#ident "GENERIC-$Revision: 1.187 $" maxusers 64 @@ -56,14 +56,14 @@ options SYSVMSG # System V message que options SYSVSEM # System V semaphores options SYSVSHM # System V shared memory -options MODULAR # new style module(7) framework -options MODULAR_DEFAULT_AUTOLOAD +options MODULAR # new style module(7) framework +options MODULAR_DEFAULT_AUTOLOAD options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel -# Enable experimental buffer queue strategy for better responsiveness under +# Enable experimental buffer queue strategy for better responsiveness under # high disk I/O load. Use it with caution - it's not proven to be stable yet. #options BUFQ_READPRIO #options BUFQ_PRIOCSCAN @@ -156,14 +156,14 @@ options EXEC_AOUT # execve(2) support f options EXEC_ELF32 # Exec module for SunOS 5.x binaries. #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. -options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. +options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. ## File systems. You probably need at least one of FFS or NFS. file-system FFS # Berkeley Fast Filesystem file-system NFS # Sun NFS-compatible filesystem client file-system KERNFS # kernel data-structure filesystem file-system NULLFS # NULL layered filesystem -file-system OVERLAY # overlay file system +file-system OVERLAY # overlay file system file-system MFS # memory-based filesystem file-system FDESC # user file descriptor filesystem file-system UMAPFS # uid/gid remapping filesystem @@ -201,7 +201,7 @@ options NTP # Network Time Protocol in #options PPS_SYNC # Add serial line synchronization for NTP options IPFILTER_LOG # Add ipmon(8) logging for ipfilter device options IPFILTER_LOOKUP # ippool(8) support -options IPFILTER_COMPAT # Compat for IP-Filter +options IPFILTER_COMPAT # Compat for IP-Filter #options IPFILTER_DEFAULT_BLOCK # block all packets by default options PPP_BSDCOMP # Add BSD compression to ppp device options PPP_DEFLATE # Add deflate (libz) compression to ppp device @@ -225,13 +225,13 @@ options PPP_FILTER # Add active filters Main bus and CPUs .. all systems. mainbus0 at root options MULTIPROCESSOR # include multiprocessor support -cpu* at mainbus0 # declare additional CPUs +cpu* at mainbus0 # declare additional CPUs Bus types found on SPARC systems. sbus* at mainbus0# SBus-based systems -psycho* at mainbus0# PCI-based systems -schizo* at mainbus? +psycho* at mainbus0# PCI-based systems +schizo* at mainbus? pyro* at mainbus? vpci* at mainbus0 central* at mainbus? @@ -289,7 +289,7 @@ ms0 at zstty? ## The SAB82532 controller has two serial ports sab* at ebus?# ttya/ttyb -sabtty* at sab? channel ? +sabtty* at sab? channel ? ## Part of a PC87332VLJ com* at ebus?# `com' driver for `su' @@ -297,12 +297,12 @@ kbd0 at com? # keyboard ms0 at com? # mouse ## Tadpole SPARCle PS/2 keyboard and mouse -pckbc* at ebus?# PC keyboard controller -pckbd* at pckbc? # PC keyboard -pms* at pckbc? # PS/2 mouse for wsmouse +pckbc*
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: nakayama Date: Thu May 26 04:26:05 UTC 2016 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: sort To generate a diff of this commit: cvs rdiff -u -r1.187 -r1.188 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.187 src/sys/arch/sparc64/conf/GENERIC:1.188 --- src/sys/arch/sparc64/conf/GENERIC:1.187 Wed May 25 20:00:50 2016 +++ src/sys/arch/sparc64/conf/GENERIC Thu May 26 04:26:05 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.187 2016/05/25 20:00:50 nakayama Exp $ +# $NetBSD: GENERIC,v 1.188 2016/05/26 04:26:05 nakayama 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.187 $" +#ident "GENERIC-$Revision: 1.188 $" maxusers 64 @@ -503,9 +503,9 @@ cas* at pci? dev ? function ? # Sun Cass en* at pci? dev ? function ? # ENI/Adaptec ATM UT # XXX causes ICE #ep* at pci? dev ? function ? # 3Com 3c59x -ex* at pci? dev ? function ? # 3Com 90x[B] epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet esh* at pci? dev ? function ? # Essential HIPPI card UT +ex* at pci? dev ? function ? # 3Com 90x[B] fpa* at pci? dev ? function ? # DEC DEFPA FDDI UT fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B gem* at pci? dev ? function ? # Apple GMAC and Sun ERI gigabit enet @@ -525,9 +525,9 @@ ntwoc* at pci? dev ? function ? # Riscom ral* at pci? dev ? function ? # ralink wifi UT re* at pci? dev ? function ? # Realtek 8139C+/8169/8169S/8110S rtk* at pci? dev ? function ? # Realtek 8129/8139 +sip* at pci? dev ? function ? # SiS 900 Ethernet skc* at pci? dev ? function ? # SysKonnect SK9821 Gigabit Ethernet sk* at skc?# SysKonnect SK9821 Gigabit Ethernet -sip* at pci? dev ? function ? # SiS 900 Ethernet ti* at pci? dev ? function ? # Alteon ACEnic gigabit Ethernet UT tl* at pci? dev ? function ? # ThunderLAN-based Ethernet tlp* at pci? dev ? function ? # DECchip 21x4x and clones @@ -546,10 +546,10 @@ exphy* at mii? phy ? # 3Com internal P gentbi* at mii? phy ? # Generic Ten-Bit 1000BASE-[CLS]X PHYs gphyter* at mii? phy ? # NS83861 Gig-E PHY icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x +igphy* at mii? phy ? # Intel IGP01E1000 ikphy* at mii? phy ? # Intel 82563 PHYs inphy* at mii? phy ? # Intel 82555 PHYs iophy* at mii? phy ? # Intel 82553 PHYs -igphy* at mii? phy ? # Intel IGP01E1000 lxtphy* at mii? phy ? # Level One LXT-970 PHYs makphy* at mii? phy ? # Marvell Semiconductor 88E1000 PHYs nsphy* at mii? phy ? # NS83840 PHYs
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: nakayama Date: Thu May 26 10:38:07 UTC 2016 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Add more CardBus devices. To generate a diff of this commit: cvs rdiff -u -r1.188 -r1.189 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.188 src/sys/arch/sparc64/conf/GENERIC:1.189 --- src/sys/arch/sparc64/conf/GENERIC:1.188 Thu May 26 04:26:05 2016 +++ src/sys/arch/sparc64/conf/GENERIC Thu May 26 10:38:07 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.188 2016/05/26 04:26:05 nakayama Exp $ +# $NetBSD: GENERIC,v 1.189 2016/05/26 10:38:07 nakayama 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.188 $" +#ident "GENERIC-$Revision: 1.189 $" maxusers 64 @@ -773,7 +773,9 @@ pseudo-device stf # 6to4 IPv6 over IPv # CardBus network interfaces #ath* at cardbus? function ? # Atheros 5210/5211/5212 802.11 +#athn* at cardbus? function ? # Atheros AR9k (802.11a/g/n) UT #atw* at cardbus? function ? # ADMtek ADM8211 (802.11) UT +#bwi* at cardbus? function ? # Broadcom BCM43xx wireless #ex* at cardbus? function ? # 3Com 3C575TX #fxp* at cardbus? function ? # Intel i8255x UT #ral* at cardbus? function ? # Ralink Technology RT25x0 802.11a/b/g UT @@ -787,6 +789,9 @@ pseudo-device stf # 6to4 IPv6 over IPv #ohci* at cardbus? function ? # Open Host Controller #uhci* at cardbus? function ? # Universal Host Controller (Intel) UT +# CardBus IEEE1394 controllers +#fwohci* at cardbus? function ? # IEEE1394 Open Host Controller UT + ## PCMCIA cards; UT marks untested. # PCMCIA serial interfaces
CVS commit: src/sys/arch/sparc64/conf
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
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: macallan Date: Tue Jan 6 17:51:57 UTC 2015 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: add mgx driver To generate a diff of this commit: cvs rdiff -u -r1.177 -r1.178 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.177 src/sys/arch/sparc64/conf/GENERIC:1.178 --- src/sys/arch/sparc64/conf/GENERIC:1.177 Sun Nov 16 16:01:43 2014 +++ src/sys/arch/sparc64/conf/GENERIC Tue Jan 6 17:51:57 2015 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.177 2014/11/16 16:01:43 manu Exp $ +# $NetBSD: GENERIC,v 1.178 2015/01/06 17:51:57 macallan 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.177 $" +#ident "GENERIC-$Revision: 1.178 $" maxusers 64 @@ -888,6 +888,9 @@ cgthree* at sbus? slot ? offset ? ## Sun "cgsix" accelerated color framebuffer. cgsix* at sbus? slot ? offset ? +## Southland Media Systems (now Quantum 3D) MGX +mgx* at sbus? slot ? offset ? + ## Sun FFB ffb* at mainbus0 upa* at mainbus?
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: macallan Date: Wed Jan 7 09:50:05 UTC 2015 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: enable genfb at sbus output may not be pretty but it has a halfway decent chance to work at least to some degree on otherwise unsupported graphics hardware To generate a diff of this commit: cvs rdiff -u -r1.178 -r1.179 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.178 src/sys/arch/sparc64/conf/GENERIC:1.179 --- src/sys/arch/sparc64/conf/GENERIC:1.178 Tue Jan 6 17:51:57 2015 +++ src/sys/arch/sparc64/conf/GENERIC Wed Jan 7 09:50:05 2015 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.178 2015/01/06 17:51:57 macallan Exp $ +# $NetBSD: GENERIC,v 1.179 2015/01/07 09:50:05 macallan 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.178 $" +#ident "GENERIC-$Revision: 1.179 $" maxusers 64 @@ -913,6 +913,7 @@ wcfb* at pci? # generic PCI framebuffers genfb* at pci? +genfb* at sbus? slot ? offset ? # make sure the console display is always wsdisplay0 wsdisplay0 at wsemuldisplaydev? console 1
CVS commit: src/sys/arch/sparc64/conf
Module Name:src
Committed By: palle
Date: Thu Feb 12 10:09:10 UTC 2015
Modified Files:
src/sys/arch/sparc64/conf: files.sparc64
Log Message:
sun4v: vpci driver - initial (and incomplete) version of virtual PCIe host
bridge driver for sun4v systems. Based on the NetBSD pyro driver and OpenBSD
vpci driver. Future work will include integrating code from the OpenBSD vpci
driver.
To generate a diff of this commit:
cvs rdiff -u -r1.146 -r1.147 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/files.sparc64
diff -u src/sys/arch/sparc64/conf/files.sparc64:1.146 src/sys/arch/sparc64/conf/files.sparc64:1.147
--- src/sys/arch/sparc64/conf/files.sparc64:1.146 Sat Jan 10 22:19:26 2015
+++ src/sys/arch/sparc64/conf/files.sparc64 Thu Feb 12 10:09:10 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files.sparc64,v 1.146 2015/01/10 22:19:26 palle Exp $
+# $NetBSD: files.sparc64,v 1.147 2015/02/12 10:09:10 palle Exp $
# @(#)files.sparc64 8.1 (Berkeley) 7/19/93
# sparc64-specific configuration info
@@ -36,11 +36,14 @@ device schizo: pcibus, sysmon_power, sys
attach schizo at mainbus
device pyro: pcibus, sysmon_power, sysmon_taskq
attach pyro at mainbus
+device vpci: pcibus, sysmon_power, sysmon_taskq
+attach vpci at mainbus
include "dev/pci/files.pci"
file arch/sparc64/dev/psycho.c psycho needs-flag
file arch/sparc64/dev/schizo.c schizo
file arch/sparc64/dev/pyro.c pyro
-file arch/sparc64/dev/pci_machdep.c psycho | schizo | pyro
+file arch/sparc64/dev/vpci.c vpci
+file arch/sparc64/dev/pci_machdep.c psycho | schizo | pyro | vpci
define central {}
device central: central
@@ -56,7 +59,7 @@ file arch/sparc64/dev/fhc_central.c fhc
file arch/sparc64/dev/fhc_mainbus.c fhc_mainbus
# IOMMU is for both
-file arch/sparc64/dev/iommu.c sbus | psycho | schizo | pyro
+file arch/sparc64/dev/iommu.c sbus | psycho | schizo | pyro | vpci
include "dev/ata/files.ata"
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: nakayama Date: Sun Feb 15 01:43:11 UTC 2015 Modified Files: src/sys/arch/sparc64/conf: files.sparc64 Log Message: Fix up sysmon_* dependencies. To generate a diff of this commit: cvs rdiff -u -r1.147 -r1.148 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/files.sparc64 diff -u src/sys/arch/sparc64/conf/files.sparc64:1.147 src/sys/arch/sparc64/conf/files.sparc64:1.148 --- src/sys/arch/sparc64/conf/files.sparc64:1.147 Thu Feb 12 10:09:10 2015 +++ src/sys/arch/sparc64/conf/files.sparc64 Sun Feb 15 01:43:11 2015 @@ -1,4 +1,4 @@ -# $NetBSD: files.sparc64,v 1.147 2015/02/12 10:09:10 palle Exp $ +# $NetBSD: files.sparc64,v 1.148 2015/02/15 01:43:11 nakayama Exp $ # @(#)files.sparc64 8.1 (Berkeley) 7/19/93 # sparc64-specific configuration info @@ -32,11 +32,11 @@ file arch/sparc64/dev/sbus.c sbus device psycho: pcibus, sysmon_power, sysmon_taskq attach psycho at mainbus -device schizo: pcibus, sysmon_power, sysmon_taskq +device schizo: pcibus attach schizo at mainbus -device pyro: pcibus, sysmon_power, sysmon_taskq +device pyro: pcibus attach pyro at mainbus -device vpci: pcibus, sysmon_power, sysmon_taskq +device vpci: pcibus attach vpci at mainbus include "dev/pci/files.pci" file arch/sparc64/dev/psycho.c psycho needs-flag @@ -79,7 +79,7 @@ device rtc: mc146818 attach rtc at ebus with rtc_ebus file arch/sparc64/dev/rtc.c rtc -device psm: sysmon_envsys, sysmon_power +device psm: sysmon_power attach psm at ebus file arch/sparc64/dev/psm.c psm @@ -90,15 +90,15 @@ device power attach power at sbus, ebus file arch/sparc64/dev/power.c power -device tda +device tda: sysmon_envsys attach tda at iic file arch/sparc64/dev/tda.c tda -device pcfiic: sysmon_envsys, pcf8584, i2cbus +device pcfiic: pcf8584, i2cbus attach pcfiic at ebus file arch/sparc64/dev/pcfiic_ebus.c pcfiic -device ecadc +device ecadc: sysmon_envsys attach ecadc at iic file arch/sparc64/dev/pcf8591_envctrl.c ecadc
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: mrg Date: Sat May 9 01:20:07 UTC 2015 Modified Files: src/sys/arch/sparc64/conf: std.sparc64-32 Log Message: revert previous. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sparc64/conf/std.sparc64-32 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/std.sparc64-32 diff -u src/sys/arch/sparc64/conf/std.sparc64-32:1.4 src/sys/arch/sparc64/conf/std.sparc64-32:1.5 --- src/sys/arch/sparc64/conf/std.sparc64-32:1.4 Thu May 7 19:14:56 2015 +++ src/sys/arch/sparc64/conf/std.sparc64-32 Sat May 9 01:20:07 2015 @@ -1,4 +1,4 @@ -# $NetBSD: std.sparc64-32,v 1.4 2015/05/07 19:14:56 mrg Exp $ +# $NetBSD: std.sparc64-32,v 1.5 2015/05/09 01:20:07 mrg Exp $ # # Unneeded NetBSD/sparc64 kernel options when building 32-bit kernels. @@ -10,6 +10,3 @@ no makeoptions LP64 makeoptions LP64="no" no options EXEC_ELF64 - -options CHILD_MAX=1024 # 160 is too few -options OPEN_MAX=1024 # 128 is too few
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: jdc Date: Wed Dec 16 08:00:00 UTC 2015 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Add adm1026hm* for V210, V240, and V440 environmental monitoring. To generate a diff of this commit: cvs rdiff -u -r1.182 -r1.183 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.182 src/sys/arch/sparc64/conf/GENERIC:1.183 --- src/sys/arch/sparc64/conf/GENERIC:1.182 Sat Sep 26 11:16:13 2015 +++ src/sys/arch/sparc64/conf/GENERIC Wed Dec 16 08:00:00 2015 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.182 2015/09/26 11:16:13 maxv Exp $ +# $NetBSD: GENERIC,v 1.183 2015/12/16 08:00:00 jdc 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.182 $" +#ident "GENERIC-$Revision: 1.183 $" maxusers 64 @@ -950,6 +950,7 @@ iic* at alipm? spdmem* at iic? addr? admtemp* at iic? addr? +adm1026hm* at iic? addr? ecadc* at iic? addr? # envctrl/envctrltwo on E250/E450 lmtemp* at iic? addr? tda* at iic? addr? # fan control on SB1000/2000
CVS commit: src/sys/arch/sparc64/conf
Module Name:src
Committed By: uebayasi
Date: Sat Nov 15 12:41:36 UTC 2014
Modified Files:
src/sys/arch/sparc64/conf: Makefile.sparc64
Log Message:
Use LINKSCRIPT.
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/sparc64/conf/Makefile.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/Makefile.sparc64
diff -u src/sys/arch/sparc64/conf/Makefile.sparc64:1.74 src/sys/arch/sparc64/conf/Makefile.sparc64:1.75
--- src/sys/arch/sparc64/conf/Makefile.sparc64:1.74 Fri Feb 21 20:45:12 2014
+++ src/sys/arch/sparc64/conf/Makefile.sparc64 Sat Nov 15 12:41:36 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sparc64,v 1.74 2014/02/21 20:45:12 joerg Exp $
+# $NetBSD: Makefile.sparc64,v 1.75 2014/11/15 12:41:36 uebayasi Exp $
#=
#
@@ -108,7 +108,7 @@ dependkernlib: assym.h
## (5) link settings
##
TEXTADDR?= 0100
-LINKFORMAT= -T ${SPARC64}/conf/${KERN_LDSCRIPT}
+LINKSCRIPT= -T ${SPARC64}/conf/${KERN_LDSCRIPT}
.if ${LP64} == "yes"
KERN_LDSCRIPT?= kern.ldscript
.else
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: christos Date: Sun Dec 15 07:52:53 UTC 2013 Modified Files: src/sys/arch/sparc64/conf: INSTALL Log Message: Add -Wno-uninitialized with -Os so that we don't get spurious gcc warnings. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/arch/sparc64/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/sparc64/conf/INSTALL diff -u src/sys/arch/sparc64/conf/INSTALL:1.28 src/sys/arch/sparc64/conf/INSTALL:1.29 --- src/sys/arch/sparc64/conf/INSTALL:1.28 Sun Jul 10 04:51:24 2011 +++ src/sys/arch/sparc64/conf/INSTALL Sun Dec 15 02:52:53 2013 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.28 2011/07/10 08:51:24 mrg Exp $ +# $NetBSD: INSTALL,v 1.29 2013/12/15 07:52:53 christos Exp $ # # NOTE: this file only needs *additional* things for the install # kernel, that are not already included in GENERIC! @@ -6,9 +6,9 @@ include "arch/sparc64/conf/GENERIC" -#ident "INSTALL-$Revision: 1.28 $" +#ident "INSTALL-$Revision: 1.29 $" -makeoptions COPTS="-Os" +makeoptions COPTS="-Os -Wno-uninitialized" options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
CVS commit: src/sys/arch/sparc64/conf
Module Name:src
Committed By: nakayama
Date: Sat Dec 28 11:09:33 UTC 2013
Modified Files:
src/sys/arch/sparc64/conf: files.sparc64
Log Message:
Add SUN4V to opt_sparc_arch.h.
To generate a diff of this commit:
cvs rdiff -u -r1.143 -r1.144 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/files.sparc64
diff -u src/sys/arch/sparc64/conf/files.sparc64:1.143 src/sys/arch/sparc64/conf/files.sparc64:1.144
--- src/sys/arch/sparc64/conf/files.sparc64:1.143 Mon Dec 16 20:17:34 2013
+++ src/sys/arch/sparc64/conf/files.sparc64 Sat Dec 28 11:09:33 2013
@@ -1,4 +1,4 @@
-# $NetBSD: files.sparc64,v 1.143 2013/12/16 20:17:34 palle Exp $
+# $NetBSD: files.sparc64,v 1.144 2013/12/28 11:09:33 nakayama Exp $
# @(#)files.sparc64 8.1 (Berkeley) 7/19/93
# sparc64-specific configuration info
@@ -8,7 +8,7 @@ maxpartitions 8
maxusers 2 8 1024
-defflag opt_sparc_arch.h SUN4U
+defflag opt_sparc_arch.h SUN4U SUN4V
define mainbus {}
device mainbus: mainbus
CVS commit: src/sys/arch/sparc64/conf
Module Name:src
Committed By: joerg
Date: Fri Feb 21 20:45:12 UTC 2014
Modified Files:
src/sys/arch/sparc64/conf: Makefile.sparc64
Log Message:
Use code model small for LLVM, it should be equivalent to GCC's medlow.
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/sparc64/conf/Makefile.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/Makefile.sparc64
diff -u src/sys/arch/sparc64/conf/Makefile.sparc64:1.73 src/sys/arch/sparc64/conf/Makefile.sparc64:1.74
--- src/sys/arch/sparc64/conf/Makefile.sparc64:1.73 Tue Mar 19 19:59:40 2013
+++ src/sys/arch/sparc64/conf/Makefile.sparc64 Fri Feb 21 20:45:12 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sparc64,v 1.73 2013/03/19 19:59:40 christos Exp $
+# $NetBSD: Makefile.sparc64,v 1.74 2014/02/21 20:45:12 joerg Exp $
#=
#
@@ -59,10 +59,12 @@ CPPFLAGS+= -D_LP64 -Wa,-Av9a
AFLAGS+= -Wa,-Av9a
.if defined(PROF)
# Profiling is only supported in the medium low memory model.
-CFLAGS+= -mcmodel=medlow
+CFLAGS+= ${${ACTIVE_CC} == "gcc":? -mcmodel=medlow :}
+CFLAGS+= ${${ACTIVE_CC} == "clang":? -mcmodel=small :}
.else
# Since the kernel resides in the lower 32 bits, use medium low for now anyway.
-CFLAGS+= -mcmodel=medlow
+CFLAGS+= ${${ACTIVE_CC} == "gcc":? -mcmodel=medlow :}
+CFLAGS+= ${${ACTIVE_CC} == "clang":? -mcmodel=small :}
.endif
.else
# 32-bit kernels
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: macallan Date: Wed Feb 20 19:35:47 UTC 2013 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: add WSDISPLAY_COMPAT_PCVT To generate a diff of this commit: cvs rdiff -u -r1.157 -r1.158 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.157 src/sys/arch/sparc64/conf/GENERIC:1.158 --- src/sys/arch/sparc64/conf/GENERIC:1.157 Fri Feb 8 15:20:17 2013 +++ src/sys/arch/sparc64/conf/GENERIC Wed Feb 20 19:35:46 2013 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.157 2013/02/08 15:20:17 jdc Exp $ +# $NetBSD: GENERIC,v 1.158 2013/02/20 19:35:46 macallan 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.157 $" +#ident "GENERIC-$Revision: 1.158 $" maxusers 64 @@ -926,6 +926,8 @@ wskbd0 at kbd0 options WSEMUL_VT100 # allow us to be wsvt25 options WS_DEFAULT_FG=WSCOL_BLACK options WS_DEFAULT_BG=WSCOL_LIGHT_WHITE +options WSDISPLAY_COMPAT_PCVT # emulate some ioctls +options WSDISPLAY_COMPAT_SYSCONS # emulate some more ioctls options WSDISPLAY_COMPAT_USL # wsconscfg VT handling options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes options WSDISPLAY_DEFAULTSCREENS=4
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: martin Date: Thu Feb 21 08:07:25 UTC 2013 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Add PCVT compat (for X console switching) and another font (purely esthetical). From maccalan@. To generate a diff of this commit: cvs rdiff -u -r1.158 -r1.159 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.158 src/sys/arch/sparc64/conf/GENERIC:1.159 --- src/sys/arch/sparc64/conf/GENERIC:1.158 Wed Feb 20 19:35:46 2013 +++ src/sys/arch/sparc64/conf/GENERIC Thu Feb 21 08:07:24 2013 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.158 2013/02/20 19:35:46 macallan Exp $ +# $NetBSD: GENERIC,v 1.159 2013/02/21 08:07:24 martin 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.158 $" +#ident "GENERIC-$Revision: 1.159 $" maxusers 64 @@ -929,9 +929,11 @@ options WS_DEFAULT_BG=WSCOL_LIGHT_WHITE options WSDISPLAY_COMPAT_PCVT # emulate some ioctls options WSDISPLAY_COMPAT_SYSCONS # emulate some more ioctls options WSDISPLAY_COMPAT_USL # wsconscfg VT handling +options WSDISPLAY_COMPAT_PCVT # emulate some ioctls options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes options WSDISPLAY_DEFAULTSCREENS=4 options FONT_GALLANT12x22 # PROM font look-alike +options FONT_DROID_SANS_MONO12x22 # antialiased font Other device configuration
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: martin Date: Thu Feb 21 09:04:24 UTC 2013 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Remove duplciate WSDISPLAY_COMPAT_PCVT - no idea how that sneaked in. Thanks to Nick Hudson for the quick catch. To generate a diff of this commit: cvs rdiff -u -r1.159 -r1.160 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.159 src/sys/arch/sparc64/conf/GENERIC:1.160 --- src/sys/arch/sparc64/conf/GENERIC:1.159 Thu Feb 21 08:07:24 2013 +++ src/sys/arch/sparc64/conf/GENERIC Thu Feb 21 09:04:22 2013 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.159 2013/02/21 08:07:24 martin Exp $ +# $NetBSD: GENERIC,v 1.160 2013/02/21 09:04:22 martin 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.159 $" +#ident "GENERIC-$Revision: 1.160 $" maxusers 64 @@ -929,7 +929,6 @@ options WS_DEFAULT_BG=WSCOL_LIGHT_WHITE options WSDISPLAY_COMPAT_PCVT # emulate some ioctls options WSDISPLAY_COMPAT_SYSCONS # emulate some more ioctls options WSDISPLAY_COMPAT_USL # wsconscfg VT handling -options WSDISPLAY_COMPAT_PCVT # emulate some ioctls options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes options WSDISPLAY_DEFAULTSCREENS=4 options FONT_GALLANT12x22 # PROM font look-alike
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: christos Date: Tue Mar 12 21:41:40 UTC 2013 Modified Files: src/sys/arch/sparc64/conf: GENERIC MODULAR Log Message: turn on MODULAR by default To generate a diff of this commit: cvs rdiff -u -r1.162 -r1.163 src/sys/arch/sparc64/conf/GENERIC cvs rdiff -u -r1.3 -r1.4 src/sys/arch/sparc64/conf/MODULAR 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.162 src/sys/arch/sparc64/conf/GENERIC:1.163 --- src/sys/arch/sparc64/conf/GENERIC:1.162 Fri Mar 1 21:42:21 2013 +++ src/sys/arch/sparc64/conf/GENERIC Tue Mar 12 17:41:40 2013 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.162 2013/03/02 02:42:21 christos Exp $ +# $NetBSD: GENERIC,v 1.163 2013/03/12 21:41:40 christos 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.162 $" +#ident "GENERIC-$Revision: 1.163 $" maxusers 64 @@ -60,6 +60,8 @@ options SYSVMSG # System V message que options SYSVSEM # System V semaphores options SYSVSHM # System V shared memory +options MODULAR # new style module(7) framework + options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel Index: src/sys/arch/sparc64/conf/MODULAR diff -u src/sys/arch/sparc64/conf/MODULAR:1.3 src/sys/arch/sparc64/conf/MODULAR:1.4 --- src/sys/arch/sparc64/conf/MODULAR:1.3 Wed Jan 5 08:29:27 2011 +++ src/sys/arch/sparc64/conf/MODULAR Tue Mar 12 17:41:40 2013 @@ -1,4 +1,4 @@ -# $NetBSD: MODULAR,v 1.3 2011/01/05 13:29:27 martin Exp $ +# $NetBSD: MODULAR,v 1.4 2013/03/12 21:41:40 christos Exp $ # # MODULAR kernel - like GENERIC, but excluding lots of stuff that can # be loaded as a module later @@ -6,8 +6,9 @@ include "arch/sparc64/conf/GENERIC" -#ident "MODULAR-$Revision: 1.3 $" +#ident "MODULAR-$Revision: 1.4 $" +no options MODULAR options MODULAR # allow loading of kernel modules options INSECURE # disable kernel security levels initially # (we can't load file system modules otherwise)
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: christos Date: Tue Mar 12 21:52:48 UTC 2013 Modified Files: src/sys/arch/sparc64/conf: MODULAR Log Message: is defined now in GENERIC To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sparc64/conf/MODULAR 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/MODULAR diff -u src/sys/arch/sparc64/conf/MODULAR:1.4 src/sys/arch/sparc64/conf/MODULAR:1.5 --- src/sys/arch/sparc64/conf/MODULAR:1.4 Tue Mar 12 17:41:40 2013 +++ src/sys/arch/sparc64/conf/MODULAR Tue Mar 12 17:52:47 2013 @@ -1,4 +1,4 @@ -# $NetBSD: MODULAR,v 1.4 2013/03/12 21:41:40 christos Exp $ +# $NetBSD: MODULAR,v 1.5 2013/03/12 21:52:47 christos Exp $ # # MODULAR kernel - like GENERIC, but excluding lots of stuff that can # be loaded as a module later @@ -6,10 +6,8 @@ include "arch/sparc64/conf/GENERIC" -#ident "MODULAR-$Revision: 1.4 $" +#ident "MODULAR-$Revision: 1.5 $" -no options MODULAR -options MODULAR # allow loading of kernel modules options INSECURE # disable kernel security levels initially # (we can't load file system modules otherwise)
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: nakayama Date: Thu Mar 14 11:54:32 UTC 2013 Modified Files: src/sys/arch/sparc64/conf: files.sparc64 Log Message: Use elf32 version module object relocator on sparc64 32-bit kernel. To generate a diff of this commit: cvs rdiff -u -r1.139 -r1.140 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/files.sparc64 diff -u src/sys/arch/sparc64/conf/files.sparc64:1.139 src/sys/arch/sparc64/conf/files.sparc64:1.140 --- src/sys/arch/sparc64/conf/files.sparc64:1.139 Sat Oct 13 18:00:03 2012 +++ src/sys/arch/sparc64/conf/files.sparc64 Thu Mar 14 11:54:31 2013 @@ -1,4 +1,4 @@ -# $NetBSD: files.sparc64,v 1.139 2012/10/13 18:00:03 jdc Exp $ +# $NetBSD: files.sparc64,v 1.140 2013/03/14 11:54:31 nakayama Exp $ # @(#)files.sparc64 8.1 (Berkeley) 7/19/93 # sparc64-specific configuration info @@ -231,7 +231,8 @@ file arch/sparc64/sparc64/core_machdep.c file arch/sparc64/sparc64/emul.c file arch/sparc64/sparc64/intr.c file arch/sparc64/sparc64/kgdb_machdep.c kgdb -file arch/sparc64/sparc64/kobj_machdep.c modular +file arch/sparc/sparc/kobj_machdep.c modular & !exec_elf64 +file arch/sparc64/sparc64/kobj_machdep.c modular & exec_elf64 # sparc64/sparc64/locore.s is handled specially in the makefile, # because it must come first in the "ld" command line. file arch/sparc64/sparc64/machdep.c
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: christos Date: Sun Mar 17 00:44:16 UTC 2013 Modified Files: src/sys/arch/sparc64/conf: files.sparc64 Log Message: no more duplicate copy of the memcpy code. To generate a diff of this commit: cvs rdiff -u -r1.140 -r1.141 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/files.sparc64 diff -u src/sys/arch/sparc64/conf/files.sparc64:1.140 src/sys/arch/sparc64/conf/files.sparc64:1.141 --- src/sys/arch/sparc64/conf/files.sparc64:1.140 Thu Mar 14 07:54:31 2013 +++ src/sys/arch/sparc64/conf/files.sparc64 Sat Mar 16 20:44:16 2013 @@ -1,4 +1,4 @@ -# $NetBSD: files.sparc64,v 1.140 2013/03/14 11:54:31 nakayama Exp $ +# $NetBSD: files.sparc64,v 1.141 2013/03/17 00:44:16 christos Exp $ # @(#)files.sparc64 8.1 (Berkeley) 7/19/93 # sparc64-specific configuration info @@ -236,7 +236,6 @@ file arch/sparc64/sparc64/kobj_machdep.c # sparc64/sparc64/locore.s is handled specially in the makefile, # because it must come first in the "ld" command line. file arch/sparc64/sparc64/machdep.c -file arch/sparc64/sparc64/memcpyset.s file arch/sparc64/sparc64/process_machdep.c file arch/sparc64/sparc64/procfs_machdep.c procfs file arch/sparc/sparc/openprom.c
CVS commit: src/sys/arch/sparc64/conf
Module Name:src
Committed By: christos
Date: Tue Mar 19 19:59:41 UTC 2013
Modified Files:
src/sys/arch/sparc64/conf: Makefile.sparc64
Log Message:
Need assym.h for libkern
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/sparc64/conf/Makefile.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/Makefile.sparc64
diff -u src/sys/arch/sparc64/conf/Makefile.sparc64:1.72 src/sys/arch/sparc64/conf/Makefile.sparc64:1.73
--- src/sys/arch/sparc64/conf/Makefile.sparc64:1.72 Sun Mar 10 03:18:21 2013
+++ src/sys/arch/sparc64/conf/Makefile.sparc64 Tue Mar 19 15:59:40 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sparc64,v 1.72 2013/03/10 07:18:21 christos Exp $
+# $NetBSD: Makefile.sparc64,v 1.73 2013/03/19 19:59:40 christos Exp $
#=
#
@@ -99,6 +99,9 @@ copy.o: ${SPARC64}/sparc64/copy.S assym.
mp_subr.o: ${SPARC64}/sparc64/mp_subr.S assym.h
${NORMAL_S}
+# Our libkern needs stuff from assym.h for memcpy and memset.
+dependkernlib: assym.h
+
##
## (5) link settings
##
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: jnemeth Date: Wed Jun 5 21:45:06 UTC 2013 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: enable FFS_EI To generate a diff of this commit: cvs rdiff -u -r1.165 -r1.166 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.165 src/sys/arch/sparc64/conf/GENERIC:1.166 --- src/sys/arch/sparc64/conf/GENERIC:1.165 Sat Apr 27 21:43:41 2013 +++ src/sys/arch/sparc64/conf/GENERIC Wed Jun 5 21:45:06 2013 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.165 2013/04/27 21:43:41 christos Exp $ +# $NetBSD: GENERIC,v 1.166 2013/06/05 21:45:06 jnemeth 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.165 $" +#ident "GENERIC-$Revision: 1.166 $" maxusers 64 @@ -184,7 +184,7 @@ file-system TMPFS # Efficient memory fi options NFSSERVER # Sun NFS-compatible filesystem server options QUOTA # legacy UFS quotas options QUOTA2 # new, in-filesystem UFS quotas -#options FFS_EI # FFS Endian Independent support +options FFS_EI # FFS Endian Independent support options WAPBL # File system journaling support #options FFS_NO_SNAPSHOT # No FFS snapshot support
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: macallan Date: Tue Aug 27 13:11:12 UTC 2013 Modified Files: src/sys/arch/sparc64/conf: files.sparc64 Log Message: psycho needs-flag now while there, ffb doesn't need rasops8 To generate a diff of this commit: cvs rdiff -u -r1.141 -r1.142 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/files.sparc64 diff -u src/sys/arch/sparc64/conf/files.sparc64:1.141 src/sys/arch/sparc64/conf/files.sparc64:1.142 --- src/sys/arch/sparc64/conf/files.sparc64:1.141 Sun Mar 17 00:44:16 2013 +++ src/sys/arch/sparc64/conf/files.sparc64 Tue Aug 27 13:11:12 2013 @@ -1,4 +1,4 @@ -# $NetBSD: files.sparc64,v 1.141 2013/03/17 00:44:16 christos Exp $ +# $NetBSD: files.sparc64,v 1.142 2013/08/27 13:11:12 macallan Exp $ # @(#)files.sparc64 8.1 (Berkeley) 7/19/93 # sparc64-specific configuration info @@ -37,7 +37,7 @@ attach schizo at mainbus device pyro: pcibus, sysmon_power, sysmon_taskq attach pyro at mainbus include "dev/pci/files.pci" -file arch/sparc64/dev/psycho.c psycho +file arch/sparc64/dev/psycho.c psycho needs-flag file arch/sparc64/dev/schizo.c schizo file arch/sparc64/dev/pyro.c pyro file arch/sparc64/dev/pci_machdep.c psycho | schizo | pyro @@ -188,7 +188,7 @@ device cgfourteen attach cgfourteen at sbus file arch/sparc64/dev/cgfourteen.c cgfourteen needs-flag -device ffb: wsemuldisplaydev, rasops8, rasops32, fb, vcons, i2cexec, i2c_bitbang, ddc_read_edid, edid, videomode +device ffb: wsemuldisplaydev, rasops32, fb, vcons, i2cexec, i2c_bitbang, ddc_read_edid, edid, videomode file arch/sparc64/dev/ffb.c ffb defflag opt_ffb.h FFB_DEBUG FFB_SYNC attach ffb at mainbus,upa with ffb_mainbus
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: jdc Date: Tue Sep 24 18:12:59 UTC 2013 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Remove spdmem entries for indirect configuration on SPARCle. This is now handled in sparc64/autoconf.c (since r1.192). To generate a diff of this commit: cvs rdiff -u -r1.168 -r1.169 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.168 src/sys/arch/sparc64/conf/GENERIC:1.169 --- src/sys/arch/sparc64/conf/GENERIC:1.168 Sun Jun 30 21:38:59 2013 +++ src/sys/arch/sparc64/conf/GENERIC Tue Sep 24 18:12:59 2013 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.168 2013/06/30 21:38:59 rmind Exp $ +# $NetBSD: GENERIC,v 1.169 2013/09/24 18:12:59 jdc 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.168 $" +#ident "GENERIC-$Revision: 1.169 $" maxusers 64 @@ -942,10 +942,6 @@ lom* at ebus? # LOMlite lights out man alipm* at pci? iic* at alipm? -# I2C devices -spdmem* at iic? addr 0x50 # SPARCle memory -spdmem* at iic? addr 0x51 # SPARCle memory - spdmem* at iic? addr? admtemp* at iic? addr? ecadc* at iic? addr? # envctrl/envctrltwo on E250/E450
CVS commit: src/sys/arch/sparc64/conf
Module Name:src
Committed By: nakayama
Date: Tue Dec 19 14:34:08 UTC 2017
Modified Files:
src/sys/arch/sparc64/conf: files.sparc64
Log Message:
files.ofw is now mandatory, so use its dependency.
To generate a diff of this commit:
cvs rdiff -u -r1.153 -r1.154 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/files.sparc64
diff -u src/sys/arch/sparc64/conf/files.sparc64:1.153 src/sys/arch/sparc64/conf/files.sparc64:1.154
--- src/sys/arch/sparc64/conf/files.sparc64:1.153 Thu Jul 6 11:09:00 2017
+++ src/sys/arch/sparc64/conf/files.sparc64 Tue Dec 19 14:34:08 2017
@@ -1,4 +1,4 @@
-# $NetBSD: files.sparc64,v 1.153 2017/07/06 11:09:00 martin Exp $
+# $NetBSD: files.sparc64,v 1.154 2017/12/19 14:34:08 nakayama Exp $
# @(#)files.sparc64 8.1 (Berkeley) 7/19/93
# sparc64-specific configuration info
@@ -11,7 +11,7 @@ maxusers 2 8 1024
defflag opt_sparc_arch.h SUN4U SUN4V
define mainbus {}
-device mainbus: mainbus
+device mainbus: mainbus, ofw_subr
attach mainbus at root
define upa {}
@@ -314,9 +314,6 @@ file dev/md_root.c memory_disk_hooks
include "arch/sparc64/conf/majors.sparc64"
-# OpenFirmware convenience stuff
-file dev/ofw/ofw_subr.c
-
# Virtual rtc
device vrtc
attach vrtc at vbus
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: martin Date: Thu Mar 23 11:00:03 UTC 2017 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Comment out PAX_MPROTECT options completely, instead of just turning them off globaly. This will make the automatic tests not even try to enable mprotect, which can't work for our current PLT format and shared binaries. To generate a diff of this commit: cvs rdiff -u -r1.196 -r1.197 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.196 src/sys/arch/sparc64/conf/GENERIC:1.197 --- src/sys/arch/sparc64/conf/GENERIC:1.196 Tue Dec 13 20:42:20 2016 +++ src/sys/arch/sparc64/conf/GENERIC Thu Mar 23 11:00:03 2017 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.196 2016/12/13 20:42:20 christos Exp $ +# $NetBSD: GENERIC,v 1.197 2017/03/23 11:00:03 martin 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.196 $" +#ident "GENERIC-$Revision: 1.197 $" maxusers 64 @@ -1024,6 +1024,6 @@ options PAX_ASLR_DEBUG=1 # PaX ASLR deb options PAX_SEGVGUARD=0 # PaX Segmentation fault guard # XXX: there is no PLT format for sparc64 that cooperates with # MPROTECT, so disable it for now -options PAX_MPROTECT=0 # PaX mprotect(2) restrictions -options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug +# options PAX_MPROTECT=0 # PaX mprotect(2) restrictions +# options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug options PAX_ASLR=1 # PaX Address Space Layout Randomization
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: martin Date: Sat Mar 25 13:24:08 UTC 2017 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Add virtio PCI devices, some of them mostly untested so far To generate a diff of this commit: cvs rdiff -u -r1.197 -r1.198 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.197 src/sys/arch/sparc64/conf/GENERIC:1.198 --- src/sys/arch/sparc64/conf/GENERIC:1.197 Thu Mar 23 11:00:03 2017 +++ src/sys/arch/sparc64/conf/GENERIC Sat Mar 25 13:24:08 2017 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.197 2017/03/23 11:00:03 martin Exp $ +# $NetBSD: GENERIC,v 1.198 2017/03/25 13:24:08 martin 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.197 $" +#ident "GENERIC-$Revision: 1.198 $" maxusers 64 @@ -424,6 +424,15 @@ ld* at cac? unit ? # logical disk devi ld* at twe? unit ? ld* at mlx? unit ? +# Virtio devices +virtio* at pci? dev ? function ? # Virtio PCI device +# the baloon driver can not work on machines with non-4k pages +#viomb* at virtio? # Virtio memory balloon device +ld* at virtio? # Virtio disk device +vioif* at virtio? # Virtio network device +viornd* at virtio? # Virtio entropy device +vioscsi* at virtio? # Virtio SCSI device + ## Floppy controller and drive found on SPARCstations. # need share with the sparc, and everyone else. needs to use auxio.
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: macallan Date: Sat Oct 13 21:02:34 UTC 2018 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: add tadpmu To generate a diff of this commit: cvs rdiff -u -r1.207 -r1.208 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.207 src/sys/arch/sparc64/conf/GENERIC:1.208 --- src/sys/arch/sparc64/conf/GENERIC:1.207 Thu Sep 6 05:36:50 2018 +++ src/sys/arch/sparc64/conf/GENERIC Sat Oct 13 21:02:34 2018 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.207 2018/09/06 05:36:50 maxv Exp $ +# $NetBSD: GENERIC,v 1.208 2018/10/13 21:02:34 macallan 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.207 $" +#ident "GENERIC-$Revision: 1.208 $" maxusers 64 @@ -282,6 +282,7 @@ ms0 at com? # mouse ## Tadpole SPARCle PS/2 keyboard and mouse pckbc* at ebus? # PC keyboard controller +options HAVE_TADPMU # include support for Tadpole Viper PMU pckbd* at pckbc? # PC keyboard pms* at pckbc? # PS/2 mouse for wsmouse options PMS_SYNAPTICS_TOUCHPAD # Enable support for Synaptics Touchpads
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: macallan Date: Fri Nov 2 19:57:32 UTC 2018 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: add jbusi2c To generate a diff of this commit: cvs rdiff -u -r1.209 -r1.210 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.209 src/sys/arch/sparc64/conf/GENERIC:1.210 --- src/sys/arch/sparc64/conf/GENERIC:1.209 Tue Oct 23 19:58:53 2018 +++ src/sys/arch/sparc64/conf/GENERIC Fri Nov 2 19:57:32 2018 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.209 2018/10/23 19:58:53 jdolecek Exp $ +# $NetBSD: GENERIC,v 1.210 2018/11/02 19:57:32 macallan 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.209 $" +#ident "GENERIC-$Revision: 1.210 $" maxusers 64 @@ -253,6 +253,10 @@ rtc* at ebus? ## Timer chip found on 4/300, sun4c, sun4m and (some) sun4u systems. timer* at mainbus0# sun4c +## found in schizo-based systems +jbusi2c* at mainbus0 +iic* at jbusi2c? + # Virtual devices for sun4v systems. vrtc0 at vbus? vdsk* at cbus?
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: nakayama Date: Fri Dec 14 09:21:32 UTC 2018 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Remove comment about removed lmc*. To generate a diff of this commit: cvs rdiff -u -r1.211 -r1.212 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.211 src/sys/arch/sparc64/conf/GENERIC:1.212 --- src/sys/arch/sparc64/conf/GENERIC:1.211 Wed Dec 12 06:29:37 2018 +++ src/sys/arch/sparc64/conf/GENERIC Fri Dec 14 09:21:32 2018 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.211 2018/12/12 06:29:37 maxv Exp $ +# $NetBSD: GENERIC,v 1.212 2018/12/14 09:21:32 nakayama 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.211 $" +#ident "GENERIC-$Revision: 1.212 $" maxusers 64 @@ -511,7 +511,6 @@ gsip* at pci? dev ? function ? # Nationa ixg* at pci? dev ? function ? # Intel 8259x 10 gigabit # XXX lacks bus_dmamap_sync() #le* at pci? dev ? function ? # PCnet-PCI Ethernet -# XXX uses vtophys() mskc* at pci? dev ? function ? # Marvell Yukon 2 Gigabit Ethernet msk* at mskc? # Marvell Yukon 2 Gigabit Ethernet ne* at pci? dev ? function ? # NE2000-compatible Ethernet UT
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: jdc Date: Mon May 11 18:29:59 UTC 2020 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Add "wb at ebus" and sdmmc, ld for the SD card reader on SPARCle. To generate a diff of this commit: cvs rdiff -u -r1.226 -r1.227 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.226 src/sys/arch/sparc64/conf/GENERIC:1.227 --- src/sys/arch/sparc64/conf/GENERIC:1.226 Sat Mar 28 08:35:36 2020 +++ src/sys/arch/sparc64/conf/GENERIC Mon May 11 18:29:59 2020 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.226 2020/03/28 08:35:36 isaki Exp $ +# $NetBSD: GENERIC,v 1.227 2020/05/11 18:29:59 jdc 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.226 $" +#ident "GENERIC-$Revision: 1.227 $" maxusers 64 @@ -281,6 +281,11 @@ options PMS_SYNAPTICS_TOUCHPAD # Enable wskbd* at pckbd? console ? wsmouse* at pms? mux 0 +## Tadpole SPARCle SD card +wb* at ebus? # Winbond W83L518D SD/MMC reader +sdmmc* at wb? +ld* at sdmmc? + ## Magma Serial/Parallel driver (not tested) #magma* at sbus? slot ? offset ? #mtty* at magma?
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: martin Date: Wed May 13 10:33:16 UTC 2020 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Remove local USB device declarations, include the central list instead To generate a diff of this commit: cvs rdiff -u -r1.227 -r1.228 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.227 src/sys/arch/sparc64/conf/GENERIC:1.228 --- src/sys/arch/sparc64/conf/GENERIC:1.227 Mon May 11 18:29:59 2020 +++ src/sys/arch/sparc64/conf/GENERIC Wed May 13 10:33:16 2020 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.227 2020/05/11 18:29:59 jdc Exp $ +# $NetBSD: GENERIC,v 1.228 2020/05/13 10:33:16 martin 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.227 $" +#ident "GENERIC-$Revision: 1.228 $" maxusers 64 @@ -558,120 +558,8 @@ usb* at ohci? usb* at uhci? #usb* at slhci? -# USB Hubs -uhub* at usb? -uhub* at uhub? port ? - -# USB HID device -uhidev* at uhub? port ? configuration ? interface ? - -# USB Mice -ums* at uhidev? reportid ? -wsmouse* at ums? mux 0 - -# USB eGalax touch-panel -uep* at uhub? port ? -wsmouse* at uep? mux 0 - -# USB Keyboards -ukbd* at uhidev? reportid ? -wskbd* at ukbd? console ? mux 1 - -# USB TEMPer and TEMPerHUM -uthum* at uhidev? reportid ? - -# USB serial adapter -ucycom* at uhidev? reportid ? - -# USB Generic HID devices -uhid* at uhidev? reportid ? - -# USB Printer -ulpt* at uhub? port ? configuration ? interface ? - -# USB Modem -umodem* at uhub? port ? configuration ? -ucom* at umodem? - -# Option N.V. Wireless WAN modems -uhso* at uhub? port ? configuration ? - -# USB Mass Storage -umass* at uhub? port ? configuration ? interface ? - -# USB audio -uaudio* at uhub? port ? configuration ? - -# USB MIDI -umidi* at uhub? port ? configuration ? - -# USB IrDA -# USB-IrDA bridge spec -uirda* at uhub? port ? configuration ? interface ? -irframe* at uirda? - -# SigmaTel STIr4200 USB/IrDA Bridge -ustir* at uhub? port ? -irframe* at ustir? - -# USB Ethernet adapters -aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters -axe* at uhub? port ? # ASIX AX88172 based adapters -cdce* at uhub? port ? # CDC, Ethernet Networking Control Model -cue* at uhub? port ? # CATC USB-EL1201A based adapters -kue* at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters -mue* at uhub? port ? # Microchip LAN75xx/LAN78xx based adapters -udav* at uhub? port ? # Davicom DM9601 based adapters -ure* at uhub? port ? # Realtek RTL8152/RTL8153 based adapters -url* at uhub? port ? # Realtek RTL8150L based adapters - -# USB 802.11 adapters -atu* at uhub? port ? # Atmel AT76C50XX based adapters -ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g -#zyd* at uhub? port ? # Zydas ZD1211 - -# Prolific PL2301/PL2302 host-to-host adapter -upl* at uhub? port ? - -# Serial adapters -ubsa* at uhub? port ? # Belkin serial adapter -ucom* at ubsa? portno ? - -uftdi* at uhub? port ? # FTDI FT8U100AX serial adapter -ucom* at uftdi? portno ? - -umct* at uhub? port ? # MCT USB-RS232 serial adapter -ucom* at umct? portno ? - -uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter -ucom* at uplcom? portno ? - -uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial adapter -ucom* at uvscom? portno ? - -# USB Handspring Visor -uvisor* at uhub? port ? -ucom* at uvisor? - -# Kyocera AIR-EDGE PHONE -ukyopon* at uhub? port ? -ucom* at ukyopon? portno ? - -# USB scanners -#uscanner* at uhub? port ? - -# USB scanners that use SCSI emulation, e.g., HP5300 -usscanner* at uhub? port ? - -# Y@P firmware loader -uyap* at uhub? port ? - -# D-Link DSB-R100 USB radio -udsbr* at uhub? port ? -radio* at udsbr? - -# USB Generic driver -ugen* at uhub? port ? +# USB device drivers +include "dev/usb/usbdevices.config" # Firewire support fwohci* at pci? dev ? function ? # IEEE1394 Open Host Controller
