Sun Aug 8 20:04:54 2010 UTC ()
add more spdmem instances for HP xw-series workstations.
add se (scsi ethernet).


(chs)
diff -r1.264 -r1.265 src/sys/arch/i386/conf/ALL

cvs diff -r1.264 -r1.265 src/sys/arch/i386/conf/ALL (expand / switch to unified diff)

--- src/sys/arch/i386/conf/ALL 2010/08/07 09:55:59 1.264
+++ src/sys/arch/i386/conf/ALL 2010/08/08 20:04:54 1.265
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1# $NetBSD: ALL,v 1.264 2010/08/07 09:55:59 jruoho Exp $ 1# $NetBSD: ALL,v 1.265 2010/08/08 20:04:54 chs Exp $
2# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp 2# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
3# 3#
4# ALL machine description file 4# ALL machine description file
5# 5#
6# This machine description includes all devices and options and it is 6# This machine description includes all devices and options and it is
7# used to compile-test the source and does not necessarily produce a 7# used to compile-test the source and does not necessarily produce a
8# bootable or useful kernel. 8# bootable or useful kernel.
9# 9#
10# For further information on hardware support for this architecture, see 10# For further information on hardware support for this architecture, see
11# the intro(4) man page. For further information about kernel options 11# the intro(4) man page. For further information about kernel options
12# for this architecture, see the options(4) man page. For an explanation 12# for this architecture, see the options(4) man page. For an explanation
13# of each device driver in this file see the section 4 man page for the 13# of each device driver in this file see the section 4 man page for the
14# device. 14# device.
15 15
16include "arch/i386/conf/std.i386" 16include "arch/i386/conf/std.i386"
17 17
18options INCLUDE_CONFIG_FILE # embed config file in kernel binary 18options INCLUDE_CONFIG_FILE # embed config file in kernel binary
19 19
20#ident "ALL-$Revision: 1.264 $" 20#ident "ALL-$Revision: 1.265 $"
21 21
22maxusers 64 # estimated number of users 22maxusers 64 # estimated number of users
23 23
24makeoptions USE_SSP=yes 24makeoptions USE_SSP=yes
25 25
26# CPU-related options. 26# CPU-related options.
27options VM86 # virtual 8086 emulation 27options VM86 # virtual 8086 emulation
28options USER_LDT # user-settable LDT; used by WINE 28options USER_LDT # user-settable LDT; used by WINE
29options X86EMU # 386 Real Mode emulator 29options X86EMU # 386 Real Mode emulator
30options PAE # PAE mode (36 bits physical addressing) 30options PAE # PAE mode (36 bits physical addressing)
31 31
32# Enhanced SpeedStep Technology in the Pentium M 32# Enhanced SpeedStep Technology in the Pentium M
33options ENHANCED_SPEEDSTEP 33options ENHANCED_SPEEDSTEP
@@ -730,26 +730,30 @@ nsclpcsio* at isa? @@ -730,26 +730,30 @@ nsclpcsio* at isa?
730gpio* at nsclpcsio? 730gpio* at nsclpcsio?
731 731
732# Abit uGuru Hardware system monitor 732# Abit uGuru Hardware system monitor
733ug0 at isa? port 0xe0 733ug0 at isa? port 0xe0
734 734
735# VIA VT82C686A/VT8231 Hardware Monitor and Power Management Timer 735# VIA VT82C686A/VT8231 Hardware Monitor and Power Management Timer
736viaenv* at pci? dev ? function ? 736viaenv* at pci? dev ? function ?
737 737
738# Serial Presence Detect capable memory modules and optional temp sensors 738# Serial Presence Detect capable memory modules and optional temp sensors
739spdmem* at iic? addr 0x50 739spdmem* at iic? addr 0x50
740spdmem* at iic? addr 0x51 740spdmem* at iic? addr 0x51
741spdmem* at iic? addr 0x52 741spdmem* at iic? addr 0x52
742spdmem* at iic? addr 0x53 742spdmem* at iic? addr 0x53
 743spdmem* at iic? addr 0x54
 744spdmem* at iic? addr 0x55
 745spdmem* at iic? addr 0x56
 746spdmem* at iic? addr 0x57
743sdtemp* at iic? addr 0x18 747sdtemp* at iic? addr 0x18
744 748
745# I2O devices 749# I2O devices
746iop* at pci? dev ? function ? # I/O processor 750iop* at pci? dev ? function ? # I/O processor
747iopsp* at iop? tid ? # SCSI/FC-AL ports 751iopsp* at iop? tid ? # SCSI/FC-AL ports
748ld* at iop? tid ? # block devices 752ld* at iop? tid ? # block devices
749dpti* at iop? tid 0 # DPT/Adaptec control interface 753dpti* at iop? tid 0 # DPT/Adaptec control interface
750 754
751# GPIO devices 755# GPIO devices
752gpio* at gscpcib? 756gpio* at gscpcib?
753gpio* at gpiosim? 757gpio* at gpiosim?
754 758
755# 1-Wire support 759# 1-Wire support
@@ -830,26 +834,27 @@ njs* at cardbus? function ? # Workbit Ni @@ -830,26 +834,27 @@ njs* at cardbus? function ? # Workbit Ni
830aha* at mca? slot ? # Adaptec AHA-1640 834aha* at mca? slot ? # Adaptec AHA-1640
831esp* at mca? slot ? # NCR 53C90 SCSI Adapter 835esp* at mca? slot ? # NCR 53C90 SCSI Adapter
832 836
833# SCSI bus support 837# SCSI bus support
834scsibus* at scsi? 838scsibus* at scsi?
835 839
836# SCSI devices 840# SCSI devices
837sd* at scsibus? target ? lun ? # SCSI disk drives 841sd* at scsibus? target ? lun ? # SCSI disk drives
838st* at scsibus? target ? lun ? # SCSI tape drives 842st* at scsibus? target ? lun ? # SCSI tape drives
839cd* at scsibus? target ? lun ? # SCSI CD-ROM drives 843cd* at scsibus? target ? lun ? # SCSI CD-ROM drives
840ch* at scsibus? target ? lun ? # SCSI autochangers 844ch* at scsibus? target ? lun ? # SCSI autochangers
841ses* at scsibus? target ? lun ? # SCSI Enclosure Services devices 845ses* at scsibus? target ? lun ? # SCSI Enclosure Services devices
842ss* at scsibus? target ? lun ? # SCSI scanners 846ss* at scsibus? target ? lun ? # SCSI scanners
 847se* at scsibus? target ? lun ? # SCSI ethernet adapters
843uk* at scsibus? target ? lun ? # SCSI unknown 848uk* at scsibus? target ? lun ? # SCSI unknown
844 849
845# SCSI NIC 850# SCSI NIC
846se* at scsibus? target ? lun ? 851se* at scsibus? target ? lun ?
847 852
848# RAID controllers and devices 853# RAID controllers and devices
849aac* at pci? dev ? function ? # Adaptec AAC family 854aac* at pci? dev ? function ? # Adaptec AAC family
850amr* at pci? dev ? function ? # AMI/LSI Logic MegaRAID 855amr* at pci? dev ? function ? # AMI/LSI Logic MegaRAID
851arcmsr* at pci? dev ? function ? # Areca SATA RAID controllers 856arcmsr* at pci? dev ? function ? # Areca SATA RAID controllers
852cac* at eisa? slot ? # Compaq EISA array controllers 857cac* at eisa? slot ? # Compaq EISA array controllers
853cac* at pci? dev ? function ? # Compaq PCI array controllers 858cac* at pci? dev ? function ? # Compaq PCI array controllers
854ciss* at pci? dev ? function ? # HP Smart Array controllers 859ciss* at pci? dev ? function ? # HP Smart Array controllers
855icp* at pci? dev ? function ? # ICP-Vortex GDT & Intel RAID 860icp* at pci? dev ? function ? # ICP-Vortex GDT & Intel RAID