PERFORCE change 37715 for review
Marcel Moolenaar
marcel at FreeBSD.org
Sat Sep 6 23:37:03 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=37715
Change 37715 by marcel at marcel_nfs on 2003/09/06 23:36:27
o Sync $FreeBSD$ (skipped in previous integ),
o Add ataraid(4) and puc(4),
o Start the comments 1 tabstop earlier.
o Add uart(4) hints for console support.
Affected files ...
.. //depot/projects/ia64/sys/ia64/conf/GENERIC#35 edit
.. //depot/projects/ia64/sys/ia64/conf/GENERIC.hints#8 edit
Differences ...
==== //depot/projects/ia64/sys/ia64/conf/GENERIC#35 (text+ko) ====
@@ -18,133 +18,135 @@
#
# For hardware specific information check HARDWARE.TXT
#
-# $FreeBSD: src/sys/ia64/conf/GENERIC,v 1.54 2003/06/08 02:03:01 jmallett Exp $
+# $FreeBSD: src/sys/ia64/conf/GENERIC,v 1.55 2003/09/07 05:47:10 marcel Exp $
machine ia64
cpu ITANIUM
ident GENERIC
-makeoptions DEBUG=-g # Build kernel with debug information.
+makeoptions DEBUG=-g # Build kernel with debug information.
-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 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
# 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)
+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)
# ATA and ATAPI devices
-device ata # ATA controller
-device atadisk # ATA disk drive
-device atapicd # ATAPI CDROM drive
-device atapifd # ATAPI floppy drive
+device ata # ATA controller
+device atadisk # ATA disk drives
+device atapicd # ATAPI CDROM drives
+device atapifd # ATAPI floppy drives
+device ataraid # ATA RAID drives
# SCSI Controllers
-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
+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 RAID
-device ciss # Compaq Smart RAID 5*
-device dpt # DPT Smartcache III, IV
-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 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)
+device cd # CD-ROM, DVD-ROM etc.
+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 ehci # EHCI host controller
-device ohci # OHCI PCI->USB interface
-device ugen # Generic device
-device uhci # UHCI PCI->USB interface
-device uhid # Human Interface Devices
-device ukbd # Keyboard
-device ulpt # Printer
-device umass # Disks/Mass storage (need scbus & da)
-device ums # Mouse
+device ehci # EHCI host controller
+device ohci # OHCI PCI->USB interface
+device ugen # Generic device
+device uhci # UHCI PCI->USB interface
+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
# 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.
-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
+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)
+device sbp # SCSI over FireWire (need scbus & da)
# 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 tun # Packet tunnel.
-device uart # Serial port (UART)
-device vga # VGA video card driver
+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 puc # Multi I/O cards and multi-channel UARTs
+device random # Entropy device
+device sc # System console
+device tun # Packet tunnel.
+device uart # Serial port (UART)
+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
+device bpf # Berkeley packet filter
==== //depot/projects/ia64/sys/ia64/conf/GENERIC.hints#8 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/ia64/conf/GENERIC.hints,v 1.3 2002/11/05 08:23:26 marcel Exp $
+# $FreeBSD: src/sys/ia64/conf/GENERIC.hints,v 1.4 2003/09/07 05:47:10 marcel Exp $
hint.atkbdc.0.at="isa"
hint.atkbdc.0.disabled="1"
hint.atkbdc.0.port="0x060"
@@ -8,3 +8,6 @@
hint.psm.0.at="atkbdc"
hint.psm.0.disabled="1"
hint.psm.0.irq="12"
+hint.uart.0.baud="115200"
+hint.uart.0.flags="0x10"
+hint.uart.0.port="0x3f8"
More information about the p4-projects
mailing list