Date: Sun, 2 May 2004 12:28:41 -0700 (PDT) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 52091 for review Message-ID: <200405021928.i42JSf6L046624@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=52091 Change 52091 by rwatson@rwatson_tislabs on 2004/05/02 12:28:04 Set up a real integration between GENERIC and MAC. Attempt to comment out rather than delete unsupported features. Affected files ... .. //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#53 integrate Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#53 (text+ko) ==== @@ -16,17 +16,16 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.398 2004/03/15 00:49:40 obrien Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.402 2004/04/26 22:52:09 sobomax Exp $ machine i386 cpu I486_CPU cpu I586_CPU cpu I686_CPU ident MAC -maxusers 0 -#To statically compile in device wiring instead of /boot/device.hints -#hints "MAC.hints" # Default places to look for devices. +# To statically compile in device wiring instead of /boot/device.hints +#hints "GENERIC.hints" # Default places to look for devices. makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols @@ -48,6 +47,7 @@ options UFS_DIRHASH # Improve performance on big directories options MD_ROOT # MD is a potential root device options NFSCLIENT # Network Filesystem Client +#options NFSSERVER # Network Filesystem Server options NFS_ROOT # NFS usable as /, requires NFSCLIENT options MSDOSFS # MSDOS Filesystem options CD9660 # ISO 9660 Filesystem @@ -79,8 +79,9 @@ # To make an SMP kernel, the next two are needed options SMP # Symmetric MultiProcessor Kernel -device apic # I/O APIC +device apic # I/O APIC +# Bus support. Do not remove isa, even if you have no isa slots device isa device eisa device pci @@ -135,6 +136,7 @@ device iir # Intel Integrated RAID device ips # IBM (Adaptec) ServeRAID device mly # Mylex AcceleRAID/eXtremeRAID +device twa # 3ware 9000 series PATA/SATA RAID # RAID controllers device aac # Adaptec FSA RAID @@ -192,7 +194,7 @@ # If you've got a "dumb" serial or parallel PCI card that is # supported by the puc(4) glue driver, uncomment the following # line to enable it (connects to the sio and/or ppc drivers): -#device puc +#device puc # PCI Ethernet NICs. device de # DEC/Intel DC21x4x (``Tulip'') @@ -208,10 +210,11 @@ device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) device pcn # AMD Am79C97x PCI 10/100 (precedence over 'lnc') +device re # RealTek 8139C+/8169/8169S/8110S device rl # RealTek 8129/8139 device sf # Adaptec AIC-6915 (``Starfire'') device sis # Silicon Integrated Systems SiS 900/SiS 7016 -device sk # SysKonnect SK-984x and SK-982x gigabit ethernet +device sk # SysKonnect SK-984x & SK-982x gigabit ethernet device ste # Sundance ST201 (D-Link DFE-550TX) device ti # Alteon Networks Tigon I/II gigabit ethernet device tl # Texas Instruments ThunderLAN @@ -221,7 +224,7 @@ device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') device bge # Broadcom BCM570xx Gigabit Ethernet -# ISA Ethernet NICs. pccard nics included. +# ISA Ethernet NICs. pccard NICs included. device cs # Crystal Semiconductor CS89x0 NIC # 'device ed' requires 'device miibus' device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards @@ -238,7 +241,7 @@ # Wireless NIC cards device wlan # 802.11 support -device an # Aironet 4500/4800 802.11 wireless NICs. +device an # Aironet 4500/4800 802.11 wireless NICs. device awi # BayStack 660 and others device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. #device wl # Older non 802.11 Wavelan wireless NIC. @@ -247,6 +250,8 @@ device random # Entropy device device loop # Network loopback device ether # Ethernet support +#device sl # Kernel SLIP +#device ppp # Kernel PPP device tun # Packet tunnel. device pty # Pseudo-ttys (telnet etc) device md # Memory "disks" @@ -273,6 +278,7 @@ device axe # ASIX Electronics USB ethernet device cue # CATC USB ethernet device kue # Kawasaki LSI USB ethernet +device rue # RealTek RTL8150 USB ethernet # FireWire support device firewire # FireWire bus code
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200405021928.i42JSf6L046624>