Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reduce diffs between GENERIC and INSTALL.

This commit is contained in:
tsutsui 2006-12-11 14:49:12 +00:00
parent 7bf256869d
commit 5a004f99ec
2 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/arch/alpha/conf/GENERIC
View File

@ -22,7 +22,7 @@ include "arch/alpha/conf/std.alpha"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.304 $"
#ident "GENERIC-$Revision: 1.305 $"
maxusers 32
@ -33,7 +33,7 @@ options DEC_2100_A500 # Sable: AlphaServer 2100
options DEC_2100A_A500 # Lynx: AlphaServer 2100A
options DEC_3000_500 # Flamingo etc: 3000/[4-9]00*
options DEC_3000_300 # Pelican etc: 3000/300*
options DEC_AXPPCI_33 # NoName: AXPpci33, etc.
options DEC_AXPPCI_33 # NoName: AXPpci33, Multia, etc.
options DEC_EB164 # EB164: AlphaPC 164
options DEC_EB64PLUS # EB64+: AlphaPC 64, etc.
options DEC_KN20AA # KN20AA: AlphaStation 500 and 600
@ -256,7 +256,7 @@ sfb* at tc? slot ? offset ?
px* at tc? slot ? offset ?
pxg* at tc? slot ? offset ?
# TurboChannel serial attachments
# TURBOchannel serial attachments
zstty* at zsc? channel ? # serial ports on B channels
lkkbd0 at zsc1 channel ? # keyboard port on A channels
vsms0 at zsc0 channel ? # mouse port on A channels
@ -314,7 +314,7 @@ cz* at pci? dev ? function ? # Cyclades-Z (untested)
dpt* at pci? dev ? function ? # DPT SmartCache/SmartRAID
eap* at pci? dev ? function ? # Ensoniq AudioPCI
en* at pci? dev ? function ? # ENI PCI ATM (untested)
ep* at pci? dev ? function ? # 3COM 3c59x
ep* at pci? dev ? function ? # 3COM 3c59x/3c90x Ethernet
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
ex* at pci? dev ? function ? # 3COM 3c90x[BC] Ethernet
@ -342,7 +342,7 @@ cypide* at pci? dev ? function ? # Cypress IDE controllers
hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers
optiide* at pci? dev ? function ? # Opti IDE controllers
pdcide* at pci? dev ? function ? # Promise IDE controllers
pdcsata* at pci? dev ? function ? # Promise SATA150 controllers
pdcsata* at pci? dev ? function ? # Promise SATA150 controllers
satalink* at pci? dev ? function ? # SiI SATALink controllers
siside* at pci? dev ? function ? # SiS IDE controllers
slide* at pci? dev ? function ? # Symphony Labs IDE controllers
@ -384,10 +384,11 @@ lxtphy* at mii? phy ? # Level One LXT-970 PHYs
gphyter* at mii? phy ? # NS83861 Gig-E PHY
makphy* at mii? phy ? # Marvell Semiconductor 88E1000 PHYs
nsphy* at mii? phy ? # NS83840 PHYs
nsphyter* at mii? phy ? # NS83843 PHYs
qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs
sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
rgephy* at mii? phy ? # Realtek 8169S internal PHYs
rlphy* at mii? phy ? # Realtek 8139 PHYs
sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
tlphy* at mii? phy ? # ThunderLAN PHYs
ukphy* at mii? phy ? # generic unknown PHYs

103
sys/arch/alpha/conf/INSTALL
View File

@ -1,8 +1,8 @@
# $NetBSD: INSTALL,v 1.91 2006/12/09 12:45:35 tsutsui Exp $
# $NetBSD: INSTALL,v 1.92 2006/12/11 14:49:13 tsutsui Exp $
#
# Alpha INSTALL kernel.
include "arch/alpha/conf/std.alpha"
include "arch/alpha/conf/std.alpha"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
@ -10,9 +10,6 @@ makeoptions COPTS="-Os" # Optimise for space. Implies -O2
maxusers 8
options DDB
#makeoptions DEBUG="-g"
# Enable the hooks used for initializing the ram-disk.
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # Force root on ram-disk
@ -39,6 +36,10 @@ options DEC_EB66 # EB66: 21066 Evaluation Board
options DEC_6600 # EV6: 264DP OEM Board
options API_UP1000 # EV6: Alpha Processor, Inc. UP1000
# Diagnostic/debugging support options
options DDB # kernel debugger
#makeoptions DEBUG="-g"
# File systems
file-system FFS # Fast file system
file-system CD9660 # ISO-9660 CD-ROM FS (w/RockRidge extensions)
@ -46,12 +47,12 @@ file-system MSDOSFS # MS-DOS-compatible file system
file-system NFS # Sun NFS-compatible file system client
file-system KERNFS # Kernel variable file system (/kern)
# Filesystem options
# File system options
#options NFS_V2_ONLY # Exclude NFS3 and NQNFS code to save space
#options FFS_NO_SNAPSHOT # No FFS snapshot support
# Networking options
options INET # Internet protocol suite
options INET # IP + ICMP + TCP + UDP
# 4.3BSD compatibility. Should be optional, but necessary for now.
options COMPAT_43
@ -63,7 +64,11 @@ options COMPAT_11
options COMPAT_12
options COMPAT_13
options COMPAT_14
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
options COMPAT_15
options COMPAT_16
options COMPAT_20
options COMPAT_30 # NetBSD 3.0 compatibility.
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
# Misc. options
#options EISAVERBOSE # recognize "unknown" EISA devices
@ -116,13 +121,13 @@ lpt* at jensenio? port ?
mcclock* at jensenio? port ?
pckbc* at jensenio? port ?
# TurboChannel host bus adapter support
# TURBOchannel host bus adapter support
tcasic* at mainbus0
# TurboChannel bus support
# TURBOchannel bus support
tc* at tcasic?
# TurboChannel devices
# TURBOchannel devices
ioasic* at tc? slot ? offset ?
mcclock* at ioasic? offset ?
le* at ioasic? offset ?
@ -130,6 +135,7 @@ zsc0 at ioasic? offset 0x100000
zsc1 at ioasic? offset 0x180000
tcds* at tc? slot ? offset ?
asc* at tcds? chip ?
asc* at tc? slot ? offset ?
le* at tc? slot ? offset ?
fta* at tc? slot ? offset ? # DEC DEFTA FDDI cards
cfb* at tc? slot ? offset ?
@ -140,10 +146,10 @@ sfb* at tc? slot ? offset ?
px* at tc? slot ? offset ?
pxg* at tc? slot ? offset ?
# TurboChannel serial attachments
zstty* at zsc? channel ? # serial ports on B channels
lkkbd0 at zsc1 channel ? # keyboard port on A channels
vsms0 at zsc0 channel ? # mouse port on A channels
# TURBOchannel serial attachments
zstty* at zsc? channel ? # serial ports on B channels
lkkbd0 at zsc1 channel ? # keyboard port on A channels
vsms0 at zsc0 channel ? # mouse port on A channels
# PCI host bus adapter support
apecs* at mainbus?
@ -200,33 +206,36 @@ mlx* at pci? dev ? function ? # Mylex DAC960 / DEC SWXCR (untested)
mpt* at pci? dev ? function ? # LSI Fusion SCSI/FC
ne* at pci? dev ? function ? # NE2000-compatible Ethernet
pceb* at pci? dev ? function ? # Intel PCI-EISA Bridges
pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver
acardide* at pci? dev ? function ? # Acard IDE controllers
aceride* at pci? dev ? function ? # Acer Lab IDE controllers
artsata* at pci? dev ? function ? # Intel i31244 SATA controller
cmdide* at pci? dev ? function ? # CMD tech IDE controllers
cypide* at pci? dev ? function ? # Cypress IDE controllers
hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers
optiide* at pci? dev ? function ? # Opti IDE controllers
pdcide* at pci? dev ? function ? # Promise IDE controllers
pdcsata* at pci? dev ? function ? # Promise SATA150 controllers
satalink* at pci? dev ? function ? # SiI SATALink controllers
siside* at pci? dev ? function ? # SiS IDE controllers
slide* at pci? dev ? function ? # Symphony Labs IDE controllers
viaide* at pci? dev ? function ? # VIA/AMD/Nvidia IDE controllers
pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver
acardide* at pci? dev ? function ? # Acard IDE controllers
aceride* at pci? dev ? function ? # Acer Lab IDE controllers
artsata* at pci? dev ? function ? # Intel i31244 SATA controller
cmdide* at pci? dev ? function ? # CMD tech IDE controllers
cypide* at pci? dev ? function ? # Cypress IDE controllers
hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers
optiide* at pci? dev ? function ? # Opti IDE controllers
pdcide* at pci? dev ? function ? # Promise IDE controllers
pdcsata* at pci? dev ? function ? # Promise SATA150 controllers
satalink* at pci? dev ? function ? # SiI SATALink controllers
siside* at pci? dev ? function ? # SiS IDE controllers
slide* at pci? dev ? function ? # Symphony Labs IDE controllers
viaide* at pci? dev ? function ? # VIA/AMD/Nvidia IDE controllers
pcn* at pci? dev ? function ? # AMD PCnet-PCI Ethernet
pcscp* at pci? dev ? function ? # AMD Am53c974 PCscsi-PCI
ppb* at pci? dev ? function ? # PCI-PCI Bridges
re* at pci? dev ? function ? # Realtek 8169 Ethernet
rtk* at pci? dev ? function ? # Realtek 8129/8139 Ethernet
sio* at pci? dev ? function ? # Intel PCI-ISA Bridges
sip* at pci? dev ? function ? # SiS 900 Ethernet
stge* at pci? dev ? function ? # Sundance/Tamarack TC9021 GigE
tga* at pci? dev ? function ? # DEC ZLXp-E[123] Graphics
ti* at pci? dev ? function ? # Alteon Tigon Gig-E
tl* at pci? dev ? function ? # TI ThunderLAN Ethernet
tlp* at pci? dev ? function ? # DECchip 21x4x and clones
vga* at pci? dev ? function ? # PCI VGA Graphics
vr* at pci? dev ? function ? # VIA Rhine Fast Ethernet
wi* at pci? dev ? function ? # Lucent/Intersil WaveLAN/IEEE
wm* at pci? dev ? function ? # Intel I8254x Ethernet
wm* at pci? dev ? function ? # Intel 8254x Ethernet
# MII/PHY support
exphy* at mii? phy ? # 3Com internal PHYs
@ -260,14 +269,17 @@ com* at isa? port 0x3f8 irq 4 # standard serial ports
com* at isa? port 0x2f8 irq 3
ep* at isa? port ? irq ? # 3COM 3c509 Ethernet
fdc0 at isa? port 0x3f0 irq 6 drq 2 # floppy controller
lc* at isa? port ? iomem ? irq ? # DEC EtherWORKS III (LEMAC)
#le* at isa? port 0x320 irq 10 drq 7 # IsoLan, NE2100, DEPCA (unt.)
we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC Ethernet
we1 at isa? port 0x300 iomem 0xcc000 irq 10
lc0 at isa? port 0x300 iomem ? irq ? # DEC EtherWORKS III (LEMAC)
lc1 at isa? port 0x320 iomem ? irq ? # DEC EtherWORKS III (LEMAC)
depca0 at isa? port 0x300 iomem 0xd0000 iosiz 0x10000 irq 5 # DEPCA
depca1 at isa? port 0x200 iomem 0xd8000 iosiz 0x8000 irq 10 # DEPCA
le* at depca?
lpt* at isa? port 0x3bc irq 7 # standard parallel port
vga* at isa? # ISA (EISA: XXX) VGA
wdc0 at isa? port 0x1f0 irq 14 # ST506/ESDI/IDE controllers
wdc1 at isa? port 0x170 irq 15
we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC Ethernet
we1 at isa? port 0x300 iomem 0xcc000 irq 10
# EISA devices
ahb* at eisa? slot ? # Adaptec 174[024] SCSI (unt.)
@ -282,20 +294,7 @@ le* at depca?
uha* at eisa? slot ? # UltraStor 24f SCSI (unt.)
# SCSI bus support
scsibus* at adv?
#scsibus* at aic?
scsibus* at adw?
#scsibus* at aha?
scsibus* at ahb?
scsibus* at ahc?
scsibus* at asc?
scsibus* at bha?
scsibus* at dpt?
scsibus* at iha?
scsibus* at isp?
scsibus* at siop?
scsibus* at pcscp?
scsibus* at uha?
scsibus* at scsi?
# SCSI devices
cd* at scsibus? target ? lun ? # SCSI CD-ROM drives
@ -323,8 +322,6 @@ ld* at cac? unit ?
ld* at mlx? unit ?
# Workstation Console attachments
wsdisplay* at vga?
wsdisplay* at tga?
wsdisplay* at cfb?
wsdisplay* at mfb?
wsdisplay* at tfb?
@ -332,8 +329,10 @@ wsdisplay* at sfb?
#wsdisplay* at sfbp?
wsdisplay* at px?
wsdisplay* at pxg?
wskbd* at lkkbd? console ?
wsmouse* at vsms?
wsdisplay* at vga?
wsdisplay* at tga?
wskbd* at lkkbd? console ?
wsmouse* at vsms?
wskbd* at pckbd?
wsmouse* at pms?