From d954e32a8fe2dd4440d759dbb01ac58ecc35c006 Mon Sep 17 00:00:00 2001 From: chris Date: Sun, 4 Jul 2004 13:35:08 +0000 Subject: [PATCH] Update to match pseudo devices and other options in the GENERIC kernel. --- sys/arch/acorn32/conf/EB7500ATX | 100 ++++++++++++++++++++------------ 1 file changed, 64 insertions(+), 36 deletions(-) diff --git a/sys/arch/acorn32/conf/EB7500ATX b/sys/arch/acorn32/conf/EB7500ATX index a367be83f4a3..648df578db3c 100644 --- a/sys/arch/acorn32/conf/EB7500ATX +++ b/sys/arch/acorn32/conf/EB7500ATX @@ -1,9 +1,9 @@ -# $NetBSD: EB7500ATX,v 1.4 2004/03/13 19:27:40 bjh21 Exp $ +# $NetBSD: EB7500ATX,v 1.5 2004/07/04 13:35:08 chris Exp $ # -# EB7500ATX kernel +# EB7500ATX --- NetBSD/acorn32 complete configuration # # This machine description file is used to generate the default NetBSD -# kernel. This wscons kernel does not include all options, subsystems +# kernel. This generic kernel does not include all options, subsystems # and device drivers, but should be useful for most applications. # # The machine description file can be customised for your specific @@ -20,9 +20,9 @@ include "arch/acorn32/conf/std.acorn32" -#options INCLUDE_CONFIG_FILE # embed config file in kernel binary +options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "EB7500ATX-$Revision: 1.4 $" +#ident "EB7500ATX-$Revision: 1.5 $" # estimated number of users maxusers 32 @@ -46,8 +46,8 @@ file-system FFS # UFS #file-system LFS # log-structured file system file-system MFS # memory file system file-system NFS # Network file system -#file-system ADOSFS # AmigaDOS-compatible file system -#file-system EXT2FS # second extended file system (linux) +file-system ADOSFS # AmigaDOS-compatible file system +file-system EXT2FS # second extended file system (linux) file-system CD9660 # ISO 9660 + Rock Ridge file system file-system MSDOSFS # MS-DOS file system file-system FDESC # /dev/fd @@ -64,36 +64,50 @@ file-system UNION # union file system options QUOTA # UFS quotas #options FFS_EI # FFS Endian Independant support options SOFTDEP # FFS soft updates support. -#options NFSSERVER +options NFSSERVER # Networking options -#options GATEWAY # packet forwarding +options GATEWAY # packet forwarding options INET # IP + ICMP + TCP + UDP options INET6 # IPV6 #options IPSEC # IP security #options IPSEC_ESP # IP security (encryption part; define w/IPSEC) #options IPSEC_DEBUG # debug for IP security #options MROUTING # IP multicast routing -#options NS # XNS +options NS # XNS #options NSIP # XNS tunneling over IP -#options ISO,TPIP # OSI +options ISO,TPIP # OSI #options EON # OSI tunneling over IP -#options CCITT,LLC,HDLC # X.25 -#options NETATALK # AppleTalk networking -#options PFIL_HOOKS # pfil(9) packet filter hooks -#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 CCITT,LLC,HDLC # X.25 +options NETATALK # AppleTalk networking +options PFIL_HOOKS # pfil(9) packet filter hooks +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 TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG +#options ALTQ # Manipulate network interfaces' output queues +#options ALTQ_BLUE # Stochastic Fair Blue +#options ALTQ_CBQ # Class-Based Queueing +#options ALTQ_CDNR # Diffserv Traffic Conditioner +#options ALTQ_FIFOQ # First-In First-Out Queue +#options ALTQ_FLOWVALVE # RED/flow-valve (red-penalty-box) +#options ALTQ_HFSC # Hierarchical Fair Service Curve +#options ALTQ_LOCALQ # Local queueing discipline +#options ALTQ_PRIQ # Priority Queueing +#options ALTQ_RED # Random Early Detection +#options ALTQ_RIO # RED with IN/OUT +#options ALTQ_WFQ # Weighted Fair Queueing + # Compatibility options -#options COMPAT_43 # 4.3BSD compatibility. -options COMPAT_16 # NetBSD 1.6 compatibility. -#options COMPAT_14 # NetBSD 1.4 compatibility. -#options COMPAT_13 # NetBSD 1.3 compatibility. -#options COMPAT_12 # NetBSD 1.2 compatibility. +options COMPAT_43 # 4.3BSD compatibility. +options COMPAT_16 # NetBSD 1.6 compatibility. +options COMPAT_15 # NetBSD 1.5 compatibility. +options COMPAT_14 # NetBSD 1.4 compatibility. +options COMPAT_13 # NetBSD 1.3 compatibility. +options COMPAT_12 # NetBSD 1.2 compatibility. #options COMPAT_11 # NetBSD 1.1 compatibility. #options COMPAT_10 # NetBSD 1.0 compatibility. #options COMPAT_09 # NetBSD 0.9 compatibility. @@ -109,23 +123,29 @@ options SYSVSEM # System V-like semaphores #options SEMMNU=30 # number of undo structures in system options SYSVSHM # System V-like memory sharing options SHMMAXPGS=1024 # 1024 pages is the default +options P1003_1B_SEMAPHORE # p1003.1b semaphore support # Device options -#options MEMORY_DISK_HOOKS # boottime setup of ramdisk -#options MEMORY_DISK_ROOT_SIZE=3800 # Size in blocks +options MEMORY_DISK_HOOKS # boottime setup of ramdisk +#options MEMORY_DISK_ROOT_SIZE=4100 # Size in blocks #options MEMORY_DISK_IS_ROOT # use memory disk as root # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) +options SYSTRACE # system call vetting via systrace(1) options IRQSTATS # manage IRQ statistics options LKM # loadable kernel modules options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors -#options USERCONF # userconf(4) support +options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) options SYMTAB_SPACE=250000 +# 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 NEW_BUFQ_STRATEGY + # Development and Debugging options #options ARM700BUGTRACK # track the ARM700 swi bug @@ -134,8 +154,8 @@ options DIAGNOSTIC # internal consistency checks #options PMAP_DEBUG # Enable pmap_debug_level code #options IPKDB # remote kernel debugging options DDB # in-kernel debugger -options DDB_HISTORY_SIZE=100 # Enable history editing in DDB -makeoptions DEBUG="-g" # compile full symbol table +#options DDB_HISTORY_SIZE=100 # Enable history editing in DDB +#makeoptions DEBUG="-g" # compile full symbol table config netbsd root on ? type ? options NFS_BOOT_DHCP @@ -147,7 +167,7 @@ options NFS_BOOT_DHCP # The main bus device mainbus0 at root -# The boot cpu +# The boot CPU cpu0 at mainbus? # The IOMD @@ -234,11 +254,15 @@ atapibus* at atapi? # Builtin cs8920M Network adaptor cs* at rsbus? +# Builtin DS1687 clock +# Not functioning (yet) +#ds1687rtc* at rsbus? + pseudo-device loop 1 # network loopback pseudo-device bpfilter 8 # packet filter pseudo-device sl 2 # CSLIP pseudo-device ppp 2 # PPP -#pseudo-device pppoe # PPP over Ethernet (RFC 2516) +pseudo-device pppoe # PPP over Ethernet (RFC 2516) pseudo-device tun 2 # network tunneling over tty #pseudo-device gre 2 # generic L3 over IP tunnel #pseudo-device ipfilter 1 # ip filter @@ -246,14 +270,16 @@ pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933) #pseudo-device faith 1 # IPv[46] tcp relay translation i/f #pseudo-device stf 1 # 6to4 IPv6 over IPv4 encapsulation #pseudo-device strip 4 # STarmode Radio IP (Metricon Ricochet) -#pseudo-device vlan # IEEE 802.1q encapsulation -#pseudo-device bridge # simple inter-network bridging +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 pty # pseudo-terminals pseudo-device tb 1 # tablet line discipline pseudo-device vnd 4 # disk-like interface to files -#pseudo-device ccd 2 # concatenated disk devices -#pseudo-device raid 8 # RAIDframe disk driver -#options RAID_AUTOCONFIG # auto-configuration of RAID components +pseudo-device ccd 2 # concatenated disk devices +#pseudo-device cgd 4 # cryptographic disk devices +pseudo-device raid 8 # RAIDframe disk driver +options RAID_AUTOCONFIG # auto-configuration of RAID components # Options to enable various other RAIDframe RAID types. # options RF_INCLUDE_EVENODD=1 # options RF_INCLUDE_RAID5_RS=1 @@ -262,11 +288,13 @@ pseudo-device vnd 4 # disk-like interface to files # options RF_INCLUDE_INTERDECLUSTER=1 # options RF_INCLUDE_PARITY_DECLUSTERING=1 # options RF_INCLUDE_PARITY_DECLUSTERING_DS=1 -#pseudo-device md 1 # Ramdisk driver +pseudo-device md 1 # Ramdisk driver pseudo-device rnd # /dev/random and in-kernel generator pseudo-device clockctl # user control of clock subsystem -pseudo-device ksyms makeoptions MONITOR="Taxan875+LR" #makeoptions MONITOR="AKF60" makeoptions MODES="1024,768,60 1024,768,70 800,600,60 640,480,60 1280,1024 1152,900" +pseudo-device ksyms # /dev/ksyms +#pseudo-device pf # PF packet filter +#pseudo-device pflog # PF log if