Date: Sat, 31 May 2003 11:14:31 -0700 (PDT) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 32181 for review Message-ID: <200305311814.h4VIEVRK012752@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=32181 Change 32181 by marcel@marcel_nfs on 2003/05/31 11:13:31 Try to come up with a GENERIC that works for all machines we care about. Unfortunately, since USB on BigSur is still broken (I think that it's because the SMC sub embedded in the machine has a max packet length of 8 and we assume we can always send 64 byte packets) I have to disable UHCI. Of course since the PS/2 keyboard and mouse are ISA legacy, I have to disable that too. Let's see if we can still have the driver in the kernel so that we can enable the keyboard with a loader knob. While here, revamp the style and ordering. There's a big comment at the top that points people to NOTES, so there's no reason to be verbose in the comments. Keep every line within 80 characters. The ordering of devices has been changed to de-weirdify it. Having USB all the way down below the pseudo devices is just a left-over of when USB just hit the tree. The same holds for firewire. Also stop group the pseudo devices together. The destinction between real and pseudo does not exist in the iconfig syntax and has been blurred in the kernel. Nuke most of the hints. Let's not use them on ia64 unless really needed. Needs testing on pluto Affected files ... .. //depot/projects/ia64/sys/ia64/conf/GENERIC#30 edit .. //depot/projects/ia64/sys/ia64/conf/GENERIC.hints#5 edit Differences ... ==== //depot/projects/ia64/sys/ia64/conf/GENERIC#30 (text+ko) ==== @@ -12,7 +12,7 @@ # latest information. # # An exhaustive list of options and more detailed explanations of the -# device lines is also present in the ../../conf/NOTES and NOTES files. +# device lines is also present in the ../../conf/NOTES and NOTES files. # If you are in doubt as to the purpose or necessity of a line, check # first in NOTES. # @@ -24,156 +24,127 @@ cpu ITANIUM ident GENERIC -#To statically compile in device wiring instead of /boot/device.hints -#hints "GENERIC.hints" +makeoptions DEBUG=-g # Build kernel with debug information. -makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols +options CD9660 # ISO 9660 Filesystem +options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] +options DDB # Enable the kernel debugger +options FFS # Berkeley Fast Filesystem +options INET # InterNETworking +options INET6 # IPv6 communications protocols +options KTRACE # ktrace(1) syscall trace support +options MD_ROOT # MD usable as root device +options MSDOSFS # MSDOS Filesystem +options NFSCLIENT # Network Filesystem Client +options NFSSERVER # Network Filesystem Server +options NFS_ROOT # NFS usable as root device +options PROCFS # Process filesystem (/proc) +options PSEUDOFS # Pseudo-filesystem framework +options SCHED_4BSD # 4BSD scheduler +options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI +#options SMP # SMP support +options SOFTUPDATES # Enable FFS soft updates support +options SYSVMSG # SYSV-style message queues +options SYSVSEM # SYSV-style semaphores +options SYSVSHM # SYSV-style shared memory +options UFS_ACL # Support for access control lists +options UFS_DIRHASH # Hash-based directory lookup scheme +options _KPOSIX_PRIORITY_SCHEDULING # Posix P1003_1B RT extensions -options SCHED_4BSD #4BSD scheduler -options INET #InterNETworking -options INET6 #IPv6 communications protocols -options FFS #Berkeley Fast Filesystem -options SOFTUPDATES #Enable FFS soft updates support -options UFS_ACL #Support for access control lists -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 root device -options MSDOSFS #MSDOS Filesystem -options CD9660 #ISO 9660 Filesystem -options PROCFS #Process filesystem (requires PSEUDOFS) -options PSEUDOFS #Pseudo-filesystem framework -options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] -options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI -options KTRACE #ktrace(1) syscall trace support -options SYSVSHM #SYSV-style shared memory -options SYSVMSG #SYSV-style message queues -options SYSVSEM #SYSV-style semaphores -options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions - -# To make an SMP kernel -#options SMP - -# Debugging for use in -current -#options DDB #Enable the kernel debugger -#options INVARIANTS #Enable calls of extra sanity checking -#options INVARIANT_SUPPORT #Extra sanity checks of internal - #structures, required by INVARIANTS - -# Standard busses -device isa -device pci +# Various "busses" +device acpi # ACPI support (mandatory) +device firewire # FireWire bus code +device miibus # MII bus support (ethernet) +device pci # PCI bus support +device scbus # SCSI bus (required for SCSI) +device usb # USB Bus (required for USB) -# IA64 uses ACPI -device acpi - -# Floppy drives -device fdc - # ATA and ATAPI devices -device ata -device atadisk # ATA disk drives -device atapicd # ATAPI CDROM drives -device atapifd # ATAPI floppy drives -device atapist # ATAPI tape drives +device ata # ATA controller +device atadisk # ATA disk drive +device atapicd # ATAPI CDROM drive +device atapifd # ATAPI floppy drive # SCSI Controllers -device ahc # AHA2940 and onboard AIC7xxx devices -device ahd # AHA39320/29320 and onboard AIC79xx devices -device isp # Qlogic family -device mpt # LSI-Logic MPT-Fusion -device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') +device ahc # AHA2940 and AIC7xxx devices +device ahd # AHA39320/29320 and AIC79xx devices +device isp # Qlogic family +device mpt # LSI-Logic MPT-Fusion +device sym # NCR/Symbios Logic # RAID controllers interfaced to the SCSI subsystem -device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID -device ciss # Compaq Smart RAID 5* -device dpt # DPT Smartcache III, IV - See NOTES for options! -device iir # Intel Integrated RAID -device mly # Mylex AcceleRAID/eXtremeRAID +device asr # DPT SmartRAID V, VI and Adaptec RAID +device ciss # Compaq Smart RAID 5* +device dpt # DPT Smartcache III, IV +device iir # Intel Integrated RAID +device mly # Mylex AcceleRAID/eXtremeRAID # SCSI peripherals -device scbus # SCSI bus (required) -device ch # SCSI media changers -device da # Direct Access (disks) -device sa # Sequential Access (tape etc) -device cd # CD -device pass # Passthrough device (direct SCSI access) -device ses # SCSI Environmental Services (and SAF-TE) +device cd # CD +device ch # Media changer +device da # Direct Access (ie disk) +device pass # Passthrough (direct SCSI access) +device sa # Sequential Access (ie tape) +device ses # Environmental Services (and SAF-TE) # RAID controllers -device amr # AMI MegaRAID -device ida # Compaq Smart RAID -device mlx # Mylex DAC960 family +device amr # AMI MegaRAID +device ida # Compaq Smart RAID +device mlx # Mylex DAC960 family + +# USB host controllers and peripherals +#device uhci # UHCI PCI->USB interface +device ehci # EHCI host controller +device ohci # OHCI PCI->USB interface +device ugen # Generic device +device uhid # Human Interface Devices +device ukbd # Keyboard +device ulpt # Printer +device umass # Disks/Mass storage (need scbus & da) +device ums # Mouse # atkbdc0 controls both the keyboard and the PS/2 mouse -device atkbdc # AT keyboard controller -device atkbd # AT keyboard -device psm # PS/2 mouse +device atkbdc # AT keyboard controller +device atkbd # AT keyboard +device psm # PS/2 mouse -device vga # VGA video card driver - -device splash # Splash screen and screen saver support - -# syscons is the default console driver, resembling an SCO console -device sc - -#device agp # support several AGP chipsets - -# Serial (COM) ports -device sio - # PCI Ethernet NICs. -device de # DEC/Intel DC21x4x (``Tulip'') +device de # DEC/Intel DC21x4x (``Tulip'') device em # Intel PRO/1000 adapter Gigabit Ethernet Card -device txp # 3Com 3cR990 (``Typhoon'') -device vx # 3Com 3c590, 3c595 (``Vortex'') +device txp # 3Com 3cR990 (``Typhoon'') +device vx # 3Com 3c590, 3c595 (``Vortex'') # PCI Ethernet NICs that use the common MII bus controller code. -# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! -device miibus # MII bus support -device bge # Broadcom BCM570xx Gigabit Ethernet +device bge # Broadcom BCM570xx Gigabit Ethernet device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) -device pcn # AMD Am79C97x PCI 10/100 NICs -device rl # RealTek 8129/8139 -device sf # Adaptec AIC-6915 (``Starfire'') +device pcn # AMD Am79C97x PCI 10/100 NICs +device rl # RealTek 8129/8139 +device sf # Adaptec AIC-6915 (``Starfire'') device sis # Silicon Integrated Systems SiS 900/SiS 7016 -device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') +device xl # 3Com 3c90x ("Boomerang", "Cyclone") + +# USB Ethernet +device aue # ADMtek USB ethernet +device cue # CATC USB ethernet +device kue # Kawasaki LSI USB ethernet + +# FireWire support +device sbp # SCSI over FireWire (need scbus & da) -# Pseudo devices - the number indicates how many units to allocated. -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" -device gif # IPv6 and IPv4 tunneling -device faith # IPv6-to-IPv4 relaying (translation) +# Various (pseudo) devices +device ether # Ethernet support +device faith # IPv6-to-IPv4 relaying (translation) +device gif # IPv6 and IPv4 tunneling +device loop # Network loopback +device md # Memory "disks" +device pty # Pseudo-ttys (telnet etc) +device random # Entropy device +device sc # System console +device sio # Serial port (UART) +device tun # Packet tunnel. +device vga # VGA video card driver # The `bpf' device enables the Berkeley Packet Filter. # Be aware of the administrative consequences of enabling this! -device bpf #Berkeley packet filter - -# USB support -#device uhci # UHCI PCI->USB interface (breaks BigSur!) -device ehci # EHCI host controller -device ohci # OHCI PCI->USB interface -device usb # USB Bus (required) -device ugen # Generic -device uhid # "Human Interface Devices" -device ukbd # Keyboard -device ulpt # Printer -device umass # Disks/Mass storage - Requires scbus and da0 -device ums # Mouse -# USB Ethernet -device aue # ADMtek USB ethernet -device cue # CATC USB ethernet -device kue # Kawasaki LSI USB ethernet - -# FireWire support -device firewire # FireWire bus code -device sbp # SCSI over FireWire (Requires scbus and da) -device fwe # Ethernet over FireWire (non-standard!) +device bpf # Berkeley packet filter ==== //depot/projects/ia64/sys/ia64/conf/GENERIC.hints#5 (text+ko) ==== @@ -1,24 +1,8 @@ # $FreeBSD: src/sys/ia64/conf/GENERIC.hints,v 1.3 2002/11/05 08:23:26 marcel Exp $ -hint.fdc.0.at="isa" -hint.fdc.0.port="0x3F0" -hint.fdc.0.irq="6" -hint.fdc.0.drq="2" -hint.fd.0.at="fdc0" -hint.fd.0.drive="0" hint.atkbdc.0.at="isa" +hint.atkbdc.0.disabled="1" hint.atkbdc.0.port="0x060" hint.atkbd.0.at="atkbdc" hint.atkbd.0.irq="1" hint.psm.0.at="atkbdc" hint.psm.0.irq="12" -hint.vga.0.at="isa" -hint.sc.0.at="isa" -hint.sio.0.at="isa" -hint.sio.0.port="0x3F8" -hint.sio.0.flags="0x10" -hint.sio.0.irq="4" -hint.sio.1.at="isa" -hint.sio.1.port="0x2F8" -hint.sio.1.irq="3" -hint.ppc.0.at="isa" -hint.ppc.0.irq="7"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200305311814.h4VIEVRK012752>