sync with GENERIC: enable SOFTDEP, add vlan, etc.

This commit is contained in:
soda 2001-05-21 03:37:30 +00:00
parent 17dad5433e
commit 510d65b241
6 changed files with 41 additions and 22 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: ARCTIC,v 1.9 2000/09/24 15:59:28 jdolecek Exp $ # $NetBSD: ARCTIC,v 1.10 2001/05/21 03:37:30 soda Exp $
# $OpenBSD: ARCTIC,v 1.12 1999/08/29 12:14:03 niklas Exp $ # $OpenBSD: ARCTIC,v 1.12 1999/08/29 12:14:03 niklas Exp $
# #
# configuration file for DeskStation # configuration file for DeskStation
@ -72,7 +72,7 @@ file-system PROCFS # /proc
# File system options # File system options
options QUOTA # FFS quotas options QUOTA # FFS quotas
#options FFS_EI # FFS Endian Independent support #options FFS_EI # FFS Endian Independent support
#options SOFTDEP # FFS soft updates support. options SOFTDEP # FFS soft updates support.
options NFSSERVER # Network File System server options NFSSERVER # Network File System server
#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and #options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
# immutable) behave as system flags. # immutable) behave as system flags.
@ -236,6 +236,7 @@ pseudo-device ipip 2 # IP Encapsulation within IP (RFC 2003)
pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933) pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933)
#pseudo-device faith 1 # IPv[46] tcp relay translation i/f #pseudo-device faith 1 # IPv[46] tcp relay translation i/f
#pseudo-device stf 1 # 6to4 IPv6 over IPv4 encapsulation #pseudo-device stf 1 # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
# miscellaneous pseudo-devices # miscellaneous pseudo-devices
pseudo-device pty # pseudo-terminals pseudo-device pty # pseudo-terminals

View File

@ -1,4 +1,4 @@
# $NetBSD: M403,v 1.11 2000/12/24 09:25:25 ur Exp $ # $NetBSD: M403,v 1.12 2001/05/21 03:37:31 soda Exp $
# #
# configuration file for MIPS Magnum 4000 system # configuration file for MIPS Magnum 4000 system
# #
@ -67,7 +67,7 @@ file-system PROCFS # /proc
# File system options # File system options
options QUOTA # FFS quotas options QUOTA # FFS quotas
#options FFS_EI # FFS Endian Independent support #options FFS_EI # FFS Endian Independent support
#options SOFTDEP # FFS soft updates support. options SOFTDEP # FFS soft updates support.
options NFSSERVER # Network File System server options NFSSERVER # Network File System server
#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and #options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
# immutable) behave as system flags. # immutable) behave as system flags.
@ -133,12 +133,9 @@ sn0 at jazzio?
fdc0 at jazzio? fdc0 at jazzio?
fd* at fdc? drive ? fd* at fdc? drive ?
asc0 at jazzio? asc0 at jazzio? # NCR53C9x SCSI
scsibus* at asc? scsibus* at asc?
#siop0 at jazzio?
#scsibus* at siop?
#### ISA bus devices #### ISA bus devices
isabr* at mainbus0 # ISA Bus bridge (std ISA bus). isabr* at mainbus0 # ISA Bus bridge (std ISA bus).
@ -188,6 +185,7 @@ pseudo-device ipip 2 # IP Encapsulation within IP (RFC 2003)
pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933) pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933)
#pseudo-device faith 1 # IPv[46] tcp relay translation i/f #pseudo-device faith 1 # IPv[46] tcp relay translation i/f
#pseudo-device stf 1 # 6to4 IPv6 over IPv4 encapsulation #pseudo-device stf 1 # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
# miscellaneous pseudo-devices # miscellaneous pseudo-devices
pseudo-device pty # pseudo-terminals pseudo-device pty # pseudo-terminals

View File

@ -1,4 +1,4 @@
# $NetBSD: P4032,v 1.9 2000/09/24 15:59:28 jdolecek Exp $ # $NetBSD: P4032,v 1.10 2001/05/21 03:37:31 soda Exp $
# $OpenBSD: P4032,v 1.5 1998/03/16 09:38:36 pefo Exp $ # $OpenBSD: P4032,v 1.5 1998/03/16 09:38:36 pefo Exp $
# #
# configuration file for Algorithmics P4032 board # configuration file for Algorithmics P4032 board
@ -68,7 +68,7 @@ file-system PROCFS # /proc
# File system options # File system options
options QUOTA # FFS quotas options QUOTA # FFS quotas
#options FFS_EI # FFS Endian Independent support #options FFS_EI # FFS Endian Independent support
#options SOFTDEP # FFS soft updates support. options SOFTDEP # FFS soft updates support.
options NFSSERVER # Network File System server options NFSSERVER # Network File System server
#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and #options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
# immutable) behave as system flags. # immutable) behave as system flags.
@ -163,6 +163,7 @@ pseudo-device ipip 2 # IP Encapsulation within IP (RFC 2003)
pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933) pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933)
#pseudo-device faith 1 # IPv[46] tcp relay translation i/f #pseudo-device faith 1 # IPv[46] tcp relay translation i/f
#pseudo-device stf 1 # 6to4 IPv6 over IPv4 encapsulation #pseudo-device stf 1 # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
# miscellaneous pseudo-devices # miscellaneous pseudo-devices
pseudo-device pty # pseudo-terminals pseudo-device pty # pseudo-terminals

View File

@ -1,4 +1,4 @@
# $NetBSD: PCCONS,v 1.5 2000/12/24 09:25:25 ur Exp $ # $NetBSD: PCCONS,v 1.6 2001/05/21 03:37:31 soda Exp $
# $OpenBSD: GENERIC,v 1.29 1999/08/29 12:14:03 niklas Exp $ # $OpenBSD: GENERIC,v 1.29 1999/08/29 12:14:03 niklas Exp $
# #
# PCCONS -- generic but pccons rather than wscons # PCCONS -- generic but pccons rather than wscons
@ -68,7 +68,7 @@ file-system UNION # union file system
# File system options # File system options
options QUOTA # FFS quotas options QUOTA # FFS quotas
#options FFS_EI # FFS Endian Independent support #options FFS_EI # FFS Endian Independent support
#options SOFTDEP # FFS soft updates support. options SOFTDEP # FFS soft updates support.
options NFSSERVER # Network File System server options NFSSERVER # Network File System server
#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and #options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
# immutable) behave as system flags. # immutable) behave as system flags.
@ -133,11 +133,16 @@ sn0 at jazzio?
fdc0 at jazzio? fdc0 at jazzio?
fd* at fdc? drive ? fd* at fdc? drive ?
asc0 at jazzio? asc0 at jazzio? # NCR53C9x SCSI
scsibus* at asc? scsibus* at asc?
#siop0 at jazzio? osiop0 at jazzio? flags 0x00000 # NCR53C710 SCSI
#scsibus* at siop? osiop1 at jazzio? flags 0x00000
scsibus* at osiop?
#oosiop0 at jazzio? # NCR53C700 SCSI
#oosiop1 at jazzio?
#scsibus* at oosiop?
#### ISA bus devices #### ISA bus devices
@ -148,6 +153,8 @@ isa* at isabr?
aclock0 at isa? port 0x70 irq 0 aclock0 at isa? port 0x70 irq 0
pc0 at isa? port 0x60 irq 1 # generic PC console device pc0 at isa? port 0x60 irq 1 # generic PC console device
#vga0 at isa?
#pckbc0 at isa? # PC keyboard controller
com0 at isa? port 0x3f8 irq 4 com0 at isa? port 0x3f8 irq 4
com1 at isa? port 0x2f8 irq 3 com1 at isa? port 0x2f8 irq 3
com2 at isa? port 0x3e8 irq 4 com2 at isa? port 0x3e8 irq 4
@ -245,7 +252,6 @@ wd* at pciide? channel ? drive ? flags 0x0000
atapibus* at pciide? channel ? atapibus* at pciide? channel ?
tga* at pci? dev ? function ? # DEC ZLXp-E[123] Graphics tga* at pci? dev ? function ? # DEC ZLXp-E[123] Graphics
wsdisplay* at tga?
ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI
scsibus* at ahc? scsibus* at ahc?
@ -280,6 +286,10 @@ cd* at atapibus? drive ? flags 0x0000 # ATAPI CD-ROM drives
sd* at atapibus? drive ? flags 0x0000 # ATAPI disk drives sd* at atapibus? drive ? flags 0x0000 # ATAPI disk drives
uk* at atapibus? drive ? flags 0x0000 # ATAPI unknown uk* at atapibus? drive ? flags 0x0000 # ATAPI unknown
#### Workstation Console attachments
wsdisplay* at tga?
#### Pseudo devices #### Pseudo devices
# disk/mass storage pseudo-devices # disk/mass storage pseudo-devices
@ -301,6 +311,7 @@ pseudo-device ipip 2 # IP Encapsulation within IP (RFC 2003)
pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933) pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933)
#pseudo-device faith 1 # IPv[46] tcp relay translation i/f #pseudo-device faith 1 # IPv[46] tcp relay translation i/f
#pseudo-device stf 1 # 6to4 IPv6 over IPv4 encapsulation #pseudo-device stf 1 # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
# miscellaneous pseudo-devices # miscellaneous pseudo-devices
pseudo-device pty # pseudo-terminals pseudo-device pty # pseudo-terminals

View File

@ -1,4 +1,4 @@
# $NetBSD: PICA,v 1.24 2000/12/24 09:25:25 ur Exp $ # $NetBSD: PICA,v 1.25 2001/05/21 03:37:31 soda Exp $
# #
# configuration file for ACER PICA system # configuration file for ACER PICA system
# #
@ -67,7 +67,7 @@ file-system PROCFS # /proc
# File system options # File system options
options QUOTA # FFS quotas options QUOTA # FFS quotas
#options FFS_EI # FFS Endian Independent support #options FFS_EI # FFS Endian Independent support
#options SOFTDEP # FFS soft updates support. options SOFTDEP # FFS soft updates support.
options NFSSERVER # Network File System server options NFSSERVER # Network File System server
#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and #options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
# immutable) behave as system flags. # immutable) behave as system flags.
@ -187,6 +187,7 @@ pseudo-device ipip 2 # IP Encapsulation within IP (RFC 2003)
pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933) pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933)
#pseudo-device faith 1 # IPv[46] tcp relay translation i/f #pseudo-device faith 1 # IPv[46] tcp relay translation i/f
#pseudo-device stf 1 # 6to4 IPv6 over IPv4 encapsulation #pseudo-device stf 1 # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
# miscellaneous pseudo-devices # miscellaneous pseudo-devices
pseudo-device pty # pseudo-terminals pseudo-device pty # pseudo-terminals

View File

@ -1,4 +1,4 @@
# $NetBSD: RAMDISK,v 1.12 2000/12/24 09:25:25 ur Exp $ # $NetBSD: RAMDISK,v 1.13 2001/05/21 03:37:31 soda Exp $
# $OpenBSD: RAMDISK,v 1.9 1999/08/29 12:14:03 niklas Exp $ # $OpenBSD: RAMDISK,v 1.9 1999/08/29 12:14:03 niklas Exp $
# #
# memory disk based configuration file for MIPS R4x00 ARC Systems # memory disk based configuration file for MIPS R4x00 ARC Systems
@ -141,11 +141,16 @@ sn0 at jazzio?
fdc0 at jazzio? fdc0 at jazzio?
fd* at fdc? drive ? fd* at fdc? drive ?
asc0 at jazzio? asc0 at jazzio? # NCR53C9x SCSI
scsibus* at asc? scsibus* at asc?
#siop0 at jazzio? osiop0 at jazzio? flags 0x00000 # NCR53C710 SCSI
#scsibus* at siop? osiop1 at jazzio? flags 0x00000
scsibus* at osiop?
#oosiop0 at jazzio? # NCR53C700 SCSI
#oosiop1 at jazzio?
#scsibus* at oosiop?
#### ISA bus devices #### ISA bus devices
@ -305,6 +310,8 @@ pseudo-device tun 2 # network tunneling over tty
pseudo-device ipip 2 # IP Encapsulation within IP (RFC 2003) pseudo-device ipip 2 # IP Encapsulation within IP (RFC 2003)
pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933) pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933)
#pseudo-device faith 1 # IPv[46] tcp relay translation i/f #pseudo-device faith 1 # IPv[46] tcp relay translation i/f
#pseudo-device stf 1 # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
# miscellaneous pseudo-devices # miscellaneous pseudo-devices
pseudo-device pty # pseudo-terminals pseudo-device pty # pseudo-terminals