Created
April 27, 2024 13:43
-
-
Save NCommander/8fa8cfe66afe015f02ec5c1870a511a7 to your computer and use it in GitHub Desktop.
GENERIC from 10 vs NetBSD 7.1
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
user@skywalker:~/src/NetBSD/sys/arch/vax/conf$ diff -u GENERIC7 GENERIC | |
--- GENERIC7 2024-04-27 09:42:04.572881798 -0400 | |
+++ GENERIC 2024-04-27 07:53:38.299506303 -0400 | |
@@ -1,4 +1,4 @@ | |
-# $NetBSD: GENERIC,v 1.189.6.2 2014/11/18 19:05:32 snj Exp $ | |
+# $NetBSD: GENERIC,v 1.219 2023/02/12 14:50:42 abs 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/vax/conf/std.vax" | |
+include "arch/vax/conf/std.vax" | |
options INCLUDE_CONFIG_FILE # embed config file in kernel binary | |
-#ident "GENERIC-$Revision: 1.189.6.2 $" | |
+#ident "GENERIC-$Revision: 1.219 $" | |
# Here are all different supported CPU types listed. | |
#options VAX8800 # VAX 8500, 8530, 8550, 8700, 8800 | |
@@ -36,7 +36,7 @@ | |
options VAX660 # VAX 4000/200 | |
options VAX670 # VAX 4000/300 | |
options VAX680 # VAX 4000/[45]00 | |
-options VAX410 # VS 2000 | |
+options VAX410 # VS 2000, VS 3100/m30,m38,m40,m48 | |
options VAX43 # VS 3100/76 | |
options VAX46 # VS 4000/60 | |
options VAX48 # VS 4000 VLC | |
@@ -53,7 +53,6 @@ | |
options KTRACE | |
#options DIAGNOSTIC | |
#options DEBUG | |
-#options KMEMSTATS | |
#options PMAPDEBUG | |
#options TRAPDEBUG | |
#options LOCKDEBUG | |
@@ -72,10 +71,7 @@ | |
options PPP_BSDCOMP # BSD-Compress compression support for PPP | |
options PPP_DEFLATE # Deflate compression support for PPP | |
options PPP_FILTER # Active filter support for PPP (requires bpf) | |
-#options IPFILTER_LOG # ipmon(8) log support | |
-#options IPFILTER_LOOKUP # ippool(8) support | |
-options IPFILTER_COMPAT # Compat for IP-Filter | |
-#options IPFILTER_DEFAULT_BLOCK # block all packets by default | |
+options CPU_IN_CKSUM # optimized checksum routine | |
#options ALTQ # Manipulate network interfaces' output queues | |
#options ALTQ_BLUE # Stochastic Fair Blue | |
@@ -107,16 +103,18 @@ | |
file-system TMPFS # Efficient memory file-system | |
#file-system UDF # experimental - OSTA UDF CD/DVD file-system | |
+# File system options | |
+#options FFS_EI # FFS Endian Independent support | |
+#options FFS_NO_SNAPSHOT # No FFS snapshot support | |
options QUOTA # legacy UFS quotas | |
options QUOTA2 # new, in-filesystem UFS quotas | |
-#options FFS_EI # FFS Endian Independent support | |
+#options UFS_DIRHASH # UFS Large Directory Hashing | |
+options UFS_EXTATTR # Extended attribute support for UFS1 | |
options WAPBL # File system journaling support | |
-#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental | |
-options NFSSERVER | |
+#options LFS_DIRHASH # LFS version of UFS_DIRHASH - experimental | |
+options NFSSERVER # Network File System server | |
options NFS_BOOT_BOOTP,NFS_BOOT_DHCP # Use bootp <> dhcp | |
options NFS_BOOT_BOOTPARAM # Use the Sun way for netbooting. | |
-#options FFS_NO_SNAPSHOT # No FFS snapshot support | |
-options UFS_EXTATTR # Extended attribute support for UFS1 | |
# WS console uses VT100 terminal emulation | |
options WSEMUL_VT100 | |
@@ -133,35 +131,20 @@ | |
# Note that if COMPAT_ULTRIX is set, you lose compatibility with | |
# 4.3BSD Reno programs and get Ultrix compatibility instead. | |
# (They cannot coexist). | |
+include "conf/compat_netbsd09.config" | |
options COMPAT_VAX1K # Must be present to run pre-1.4 binaries. | |
-options COMPAT_43 | |
-options COMPAT_09 | |
-options COMPAT_10 | |
-options COMPAT_11 | |
-options COMPAT_12 | |
-options COMPAT_13 | |
-options COMPAT_14 | |
-options COMPAT_15 | |
-options COMPAT_16 | |
-options COMPAT_20 | |
-options COMPAT_30 # NetBSD 3.0 compatibility. | |
-options COMPAT_40 # NetBSD 4.0 compatibility. | |
-options COMPAT_50 # NetBSD 5.0 compatibility. | |
-options COMPAT_60 # NetBSD 6.0 compatibility. | |
options COMPAT_ULTRIX | |
-options COMPAT_IBCS2 # DEC SVR.3 compatilibity | |
#options NO_INSN_EMULATE # CPU does not lack some hardware instructions. | |
-options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. | |
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 | |
-# high disk I/O load. Use it with caution - it's not proven to be stable yet. | |
+# Alternate buffer queue strategies for better responsiveness under high | |
+# disk I/O load. | |
#options BUFQ_READPRIO | |
-#options BUFQ_PRIOCSCAN | |
+options BUFQ_PRIOCSCAN | |
# Kernel(s) to compile | |
config netbsd root on ? type ? | |
@@ -202,14 +185,21 @@ | |
asc0 at vsbus0 csr 0x200c0080 # VS4000/60 (or VLC) SCSI-ctlr | |
asc0 at vsbus0 csr 0x26000080 # VS4000/90 and 4000/10x SCSI-ctlr | |
smg0 at vsbus0 csr 0x200f0000 # Small monochrome display ctlr. | |
+gpx0 at vsbus0 csr 0x3c000000 # VS3100 GPX display option | |
#clr0 at vsbus0 csr 0x30000000 # 4- or 8-bitplans color graphics | |
spx0 at vsbus0 csr 0x38000000 # Low Cost SPX on VS4000/90. | |
-#lcg0 at vsbus0 csr 0x21801000 # VS4000/60 (or VLC) graphics | |
-tc0 at vsbus0 csr 0x36000000 # VS4000/60 or 90 TC adapter | |
+lcg0 at vsbus0 csr 0x21801000 # VS4000/60 (or VLC) graphics | |
+vsaudio0 at vsbus0 csr 0x200d0000 # VS4000/60 (or VLC) audio | |
+vsaudio0 at vsbus0 csr 0x26800000 # VS4000/90 audio | |
+audio* at audiobus? | |
+ | |
+spkr* at audio? # PC speaker (synthesized) | |
+ | |
+tc0 at vsbus0 csr 0x36800000 # VS4000/60 or 90 TC adapter | |
tcds* at tc0 slot ? offset ? # TC dual SCSI controller | |
asc* at tcds? chip ? # PMAZB/C | |
asc* at tc? slot ? offset ? # PMAZ | |
-fta* at tc? slot ? offset ? # TC FDDI controller | |
+le* at tc? slot ? offset ? # PMAD | |
hdc0 at vsbus0 csr 0x200c0000 # HDC9224 MFM/floppy ctlr | |
rd* at hdc0 drive? # RD5x disks | |
@@ -242,6 +232,7 @@ | |
# Devices on Unibus/Qbus adapters | |
uda* at uba? csr 0172150 # UDA50/RQDX? | |
uda* at uba? csr 0160334 | |
+#il* at uba? csr 0164000 # NI1010 | |
mtc* at uba? csr 0174500 # Tape MSCP ctlr | |
ts0 at uba? csr 0172520 # TS11/TSV05 tape. | |
#qd0 at uba? csr 0177400 # 4- or 8-bitplans color graphics | |
@@ -281,8 +272,9 @@ | |
# VAXstation graphics support | |
wsdisplay* at smg0 | |
+wsdisplay* at gpx0 | |
wsdisplay* at spx0 | |
-#wsdisplay* at lcg0 | |
+wsdisplay* at lcg0 | |
#wsdisplay* at clr0 | |
#wsdisplay* at qd0 | |
#wsdisplay* at qv0 | |
@@ -299,8 +291,8 @@ | |
pseudo-device loop | |
pseudo-device pty # pseudo-terminals | |
pseudo-device bpfilter | |
-#pseudo-device carp # Common Address Redundancy Protocol | |
-pseudo-device ipfilter # IP filter (firewall) and NAT | |
+pseudo-device carp # Common Address Redundancy Protocol | |
+pseudo-device npf # NPF packet filter | |
#pseudo-device sl | |
pseudo-device ppp | |
#pseudo-device pppoe # PPP over Ethernet (RFC 2516) | |
@@ -312,7 +304,7 @@ | |
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation | |
pseudo-device vlan # IEEE 802.1q encapsulation | |
pseudo-device bridge # simple inter-network bridging | |
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too | |
+pseudo-device vether # Virtual Ethernet for bridge | |
pseudo-device agr # IEEE 802.3ad link aggregation | |
pseudo-device vnd | |
#options VND_COMPRESSION # compressed vnd(4) | |
@@ -331,23 +323,12 @@ | |
pseudo-device fss # file system snapshot device | |
#pseudo-device leds # control the leds on vaxstations. | |
pseudo-device clockctl # user control of clock subsystem | |
+pseudo-device drvctl # user control of drive subsystem | |
pseudo-device ksyms # /dev/ksyms | |
pseudo-device wsmux # mouse & keyboard multiplexor | |
-#pseudo-device pf # PF packet filter | |
-#pseudo-device pflog # PF log if | |
+pseudo-device swwdog # software watchdog timer -- swwdog(4) | |
-# Veriexec | |
-# | |
-# a pseudo device needed for veriexec | |
-#pseudo-device veriexec | |
-# | |
-# Uncomment the fingerprint methods below that are desired. Note that | |
-# removing fingerprint methods will have almost no impact on the kernel | |
-# code size. | |
-# | |
-#options VERIFIED_EXEC_FP_RMD160 | |
-#options VERIFIED_EXEC_FP_SHA256 | |
-#options VERIFIED_EXEC_FP_SHA384 | |
-#options VERIFIED_EXEC_FP_SHA512 | |
-#options VERIFIED_EXEC_FP_SHA1 | |
-#options VERIFIED_EXEC_FP_MD5 | |
+include "dev/veriexec.config" | |
+ | |
+# Pull in optional local configuration - always at end | |
+cinclude "arch/vax/conf/GENERIC.local" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment