diff options
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 86 |
1 files changed, 12 insertions, 74 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index cd87febbfc7..30d0d38006f 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.21 1996/06/23 10:13:24 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.22 1996/06/23 13:54:19 deraadt Exp $ # $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $ # # GENERIC -- everything that's currently supported @@ -6,80 +6,29 @@ machine i386 # architecture, used by config; REQUIRED +include "../../../conf/GENERIC" + options I386_CPU # CPU classes; at least one is REQUIRED options I486_CPU options I586_CPU options MATH_EMULATE # floating point emulation -#options VM86 # Virtual 8086 emulation + +options VM86 # Virtual 8086 emulation +options USER_LDT # user-settable LDT; used by WINE +options XSERVER,UCONSOLE # Some BIOSes don't get the size of extended memory right. If you # have a broken BIOS, uncomment the following and set the value # properly for your system. #options EXTMEM_SIZE=... # size of extended memory - #options DUMMY_NOPS # speed hack; recommended -options XSERVER,UCONSOLE -options INSECURE # insecure; allow /dev/mem writing for X - -maxusers 32 # estimated number of users -options TIMEZONE=0 # time zone to adjust RTC time by -options DST=0 # daylight savings time used by RTC - -options SWAPPAGER # paging; REQUIRED -options VNODEPAGER # mmap() of files -options DEVPAGER # mmap() of devices - -options DDB # in-kernel debugger -#makeoptions DEBUG="-g" # compile full symbol table -options DIAGNOSTIC # internal consistency checks -options KTRACE # system call tracing, a la ktrace(1) - -options SYSVMSG # System V-like message queues -options SYSVSEM # System V-like semaphores -options SYSVSHM # System V-like memory sharing -#options SHMMAXPGS=1024 # 1024 pages is the default - -options COMPAT_NOMID # compatibility with 386BSD, BSDI, NetBSD 0.8, -options COMPAT_09 # NetBSD 0.9, -options COMPAT_10 # NetBSD 1.0, -options COMPAT_11 # NetBSD 1.1, -options COMPAT_43 # and 4.3BSD -options TCP_COMPAT_42 # TCP bug compatibility with 4.2BSD options COMPAT_SVR4 # binary compatibility with SVR4 options COMPAT_IBCS2 # binary compatibility with SCO and ISC options COMPAT_LINUX # binary compatibility with Linux options COMPAT_FREEBSD # binary compatibility with FreeBSD -options USER_LDT # user-settable LDT; used by WINE -options LKM # loadable kernel modules - -options FFS # UFS -options QUOTA # UFS quotas -options LFS # log-structured file system -options MFS # memory file system - -options NFSCLIENT # Network File System client -options NFSSERVER # Network File System server - -options CD9660 # ISO 9660 + Rock Ridge file system -options MSDOSFS # MS-DOS file system -options FDESC # /dev/fd -options FIFO # FIFOs; RECOMMENDED -options KERNFS # /kern -options NULLFS # loopback file system -options PORTAL # create sockets with open(2) -options PROCFS # /proc -options UMAPFS # NULLFS + uid and gid remapping -options UNION # union file system - -#options GATEWAY # packet forwarding -options INET # IP + ICMP + TCP + UDP -options NS # XNS -options ISO,TPIP # OSI -options EON # OSI tunneling over IP -options CCITT,LLC,HDLC # X.25 -options IPFILTER # IP packet filter for security +maxusers 32 # estimated number of users config bsd swap generic @@ -110,7 +59,7 @@ pc0 at isa? port 0x60 irq 1 # generic PC console device com0 at isa? port 0x3f8 irq 4 # standard PC serial ports com1 at isa? port 0x2f8 irq 3 com2 at isa? port 0x3e8 irq 5 -#com3 at isa? port 0x2e8 irq 9 +#com3 at isa? port 0x2e8 irq 9 # (conflicts with some video cards) #ast0 at isa? port 0x1a0 irq 5 # AST 4-port serial cards #com* at ast? slave ? #boca0 at isa? port 0x100 irq 5 # BOCA 8-port serial cards @@ -175,7 +124,7 @@ fd* at fdc? drive ? mcd0 at isa? port 0x300 irq 10 # Mitsumi CD-ROM drives wdc0 at isa? port 0x1f0 irq 14 # ST506, ESDI, and IDE controllers -#wdc1 at isa? port 0x170 irq ? +#wdc1 at isa? port 0x170 irq 15 wd* at wdc? drive ? atapibus* at wdc? @@ -186,7 +135,7 @@ wt0 at isa? port 0x300 irq 5 drq 1 # Archive and Wangtek QIC tape drives ed0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC, 3C503, and NE[12]000 ed1 at isa? port 0x250 iomem 0xd8000 irq 9 # ethernet cards ed2 at isa? port 0x300 iomem 0xcc000 irq 10 -#eg0 at isa? ... # 3C505 ethernet cards +eg0 at isa? port 0x310 irq 5 # 3C505/Etherlink+ ethernet cards el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards ep0 at isa? port ? irq ? # 3C509 ethernet cards ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN and 3C507 @@ -209,19 +158,8 @@ sp0 at pss0 port 0x530 irq 10 drq 0 # sound port driver sb0 at isa? port 0x220 irq 7 drq 1 # SoundBlaster wss0 at isa? port 0x530 irq 10 drq 0 # Windows Sound System pas0 at isa? port 0x220 irq 7 drq 1 # ProAudio Spectrum -gus0 at isa? port 0x220 irq 7 drq 1 flags 6 # Gravis Ultra Sound (flags is record drq for full-duplex) +gus0 at isa? port 0x220 irq 7 drq 1 flags 6 # Gravis UltraSound (flags is record drq) #spkr0 at pckbd? port 0x61 # Joystick driver. Probe is a little strange; add only if you have one. #joy0 at isa? port 0x201 - -pseudo-device loop 1 # network loopback -pseudo-device bpfilter 8 # packet filter -pseudo-device sl 2 # CSLIP -pseudo-device ppp 2 # PPP -pseudo-device tun 2 # network tunneling over tty - -pseudo-device pty 64 # pseudo-terminals -pseudo-device tb 1 # tablet line discipline -pseudo-device vnd 4 # paging to files -pseudo-device ccd 4 # concatenated disk devices |