diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-10-10 05:43:37 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-10-10 05:43:37 +0000 |
| commit | e79ad75f7ab6282e5939bd6869da4e904909c6af (patch) | |
| tree | 016af777cd90775833e806225c57863af8681d62 /sys/arch | |
| parent | b0961357144c1b232ec4f1e09b332df8c1f6c7d9 (diff) | |
Significant unification of RAMDISK* config files, making them diffable.
This makes it easier to remove components not required to do an install,
and subsequently add other desireable components ...
In snapshots (in various forks) for about a week.
Do some upgrades and installs, please.
Diffstat (limited to 'sys/arch')
35 files changed, 3197 insertions, 5267 deletions
diff --git a/sys/arch/alpha/conf/RAMDISK b/sys/arch/alpha/conf/RAMDISK index a2e5bd1db0b..073ed1dc9f2 100644 --- a/sys/arch/alpha/conf/RAMDISK +++ b/sys/arch/alpha/conf/RAMDISK @@ -1,10 +1,21 @@ -# $OpenBSD: RAMDISK,v 1.76 2014/03/31 04:22:26 deraadt Exp $ -# $NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $ +# $OpenBSD: RAMDISK,v 1.77 2014/10/10 05:43:33 deraadt Exp $ -machine alpha # architecture, used by config; REQUIRED +machine alpha +maxusers 4 +option TIMEZONE=0 +option DST=0 option SMALL_KERNEL option NO_PROPOLICE +option BOOT_CONFIG + +option RAMDISK_HOOKS +option MINIROOTSIZE=5744 + +option SCSITERSE + +option FFS +option INET # CPU Support; at least one is REQUIRED #option DEC_3000_500 # Flamingo etc: 3000/[4-9]00* @@ -21,140 +32,78 @@ option DEC_1000 # Mikasa etc: Digital AlphaServer 1000 option DEC_1000A # Corelle etc: Digital AlphaServer 800/1000A #option DEC_6600 # EV6: XP1000, 264DP OEM Board #option API_UP1000 # EV6: Alpha Processor UP1000 - -# Enable the hooks used for initializing the ram-disk. -option RAMDISK_HOOKS -option MINIROOTSIZE=5744 # 4 Megabytes! - option NO_IEEE # Disable IEEE math -# Standard system options -maxusers 8 # estimated number of users - -# File system options -option FFS # Fast file system - -# Networking options -option INET # Internet protocol suite - -# Misc. options -#option EISAVERBOSE # recognize "unknown" EISA devices -#option PCIVERBOSE # recognize "unknown" PCI devices -#option TCVERBOSE # recognize "unknown" TC devices -option SCSITERSE # less verbose scsi error messages option WSKBD_NO_INTL_LAYOUTS # no international keyboard layouts -option BOOT_CONFIG +config bsd root on rd0a swap on rd0b and wd0b and sd0b + +mainbus0 at root +cpu* at mainbus0 + +mcbus* at mainbus? +mcmem* at mcbus? mid? + +apecs* at mainbus? +cia* at mainbus? +lca* at mainbus? +mcpcia* at mcbus? mid? + +pci* at apecs? +pci* at cia? +pci* at lca? +pci* at ppb? +pci* at mcpcia? + +#ahc* at pci? # AHA-28xx SCSI (NOT 64-BIT) +de* at pci? # 21x4[012]-based Ethernet +dc* at pci? # 21143, "tulip" clone ethernet +fxp* at pci? # EtherExpress 10/100B ethernet cards +siop* at pci? # NCR 53c8xx SCSI +pceb* at pci? # Intel PCI-EISA bridge +vga* at pci? # PCI VGA graphics +ppb* at pci? # PCI-PCI bridges +sio* at pci? # Intel PCI-ISA bridge +tga* at pci? # DEC ZLXp-E[123] graphics +pcn* at pci? # AMD PCnet-PCI Ethernet + +qlw* at pci? # QLogic ISP SCSI +qla* at pci? # QLogic ISP 2[123]xx FibreChannel +option ISP_NOFIRMWARE + +amphy* at mii? # AMD 79C873 PHYs +bmtphy* at mii? # Broadcom 10/100 PHYs +dcphy* at mii? # Digital Clone PHYs +lxtphy* at mii? # Level1 LXT970 PHYs +mtdphy* at mii? # Myson MTD972 PHYs +nsphy* at mii? # NS and compatible PHYs +nsphyter* at mii? # NS and compatible PHYs +sqphy* at mii? # Seeq 8x220 PHYs +tqphy* at mii? # TDK 78Q212x PHYs +ukphy* at mii? # "unknown" PHYs + +isa* at pceb? +isa* at sio? + +mcclock* at isa? port 0x70 +pckbc* at isa? # PC keyboard controller +pckbd* at pckbc? # PC keyboard (kbd port) +com* at isa? port 0x3f8 irq 4 # standard serial ports +com* at isa? port 0x2f8 irq 3 +vga* at isa? # ISA (EISA: XXX) VGA + +pciide* at pci? flags 0x0000 +wd* at pciide? flags 0x0000 + +scsibus* at scsi? +sd* at scsibus? # SCSI disk drives +cd* at scsibus? # SCSI CD-ROM drives -config bsd root on rd0a swap on rd0b and wd0b and sd0b - -mainbus0 at root -cpu* at mainbus0 - -# MCBUS bus support -mcbus* at mainbus? -mcmem* at mcbus? mid? - -# PCI host bus adapter support -apecs* at mainbus? -cia* at mainbus? -lca* at mainbus? -#irongate* at mainbus? -#tsc* at mainbus0 -#tsp* at tsc? -mcpcia* at mcbus? mid? - -# PCI bus support -pci* at apecs? -pci* at cia? -pci* at lca? -pci* at ppb? -#pci* at irongate? -#pci* at tsp? -pci* at mcpcia? - -# PCI devices -#ahc* at pci? # AHA-28xx SCSI (NOT 64-BIT) -de* at pci? # 21x4[012]-based Ethernet -dc* at pci? # 21143, "tulip" clone ethernet -fxp* at pci? # EtherExpress 10/100B ethernet cards -#ne* at pci? # NE2000-compat ethernet cards -#en* at pci? # ENI PCI ATM (untested) -#ep* at pci? # 3COM 3c59x (untested) -#xl* at pci? # 3COM 3c9xx (untested) -siop* at pci? # NCR 53c8xx SCSI -pceb* at pci? # Intel PCI-EISA bridge -vga* at pci? # PCI VGA graphics -ppb* at pci? # PCI-PCI bridges -sio* at pci? # Intel PCI-ISA bridge -tga* at pci? # DEC ZLXp-E[123] graphics -pcn* at pci? # AMD PCnet-PCI Ethernet - -qlw* at pci? # QLogic ISP SCSI -qla* at pci? # QLogic ISP 2[123]xx FibreChannel -option ISP_NOFIRMWARE -#qle* at pci? # QLogic ISP 2[45]xx FibreChannel -#option QLE_NOFIRMWARE - -# Media Independent Interface (mii) drivers -amphy* at mii? # AMD 79C873 PHYs -bmtphy* at mii? # Broadcom 10/100 PHYs -dcphy* at mii? # Digital Clone PHYs -#exphy* at mii? # 3Com internal PHYs -#inphy* at mii? # Intel 82555 PHYs -#icsphy* at mii? # ICS 1890 PHYs -lxtphy* at mii? # Level1 LXT970 PHYs -mtdphy* at mii? # Myson MTD972 PHYs -nsphy* at mii? # NS and compatible PHYs -nsphyter* at mii? # NS and compatible PHYs -#qsphy* at mii? # Quality Semi QS6612 PHYs -sqphy* at mii? # Seeq 8x220 PHYs -tqphy* at mii? # TDK 78Q212x PHYs -ukphy* at mii? # "unknown" PHYs - -# ISA/EISA bus support -isa* at pceb? -isa* at sio? - -# ISA devices -mcclock* at isa? port 0x70 -pckbc* at isa? # PC keyboard controller -pckbd* at pckbc? # PC keyboard (kbd port) -com* at isa? port 0x3f8 irq 4 # standard serial ports -com* at isa? port 0x2f8 irq 3 -vga* at isa? # ISA (EISA: XXX) VGA -#we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC 80x3 ethernet series -#we1 at isa? port 0x300 iomem 0xcc000 irq 10 # -#ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3C503 ethernet cards -#ne0 at isa? port 0x240 irq 9 # NE[12]000 ethernet cards -#ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet cards -#ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet cards -#cy0 at isa? iomem 0xd4000 irq 12 # ISA cyclom card - -# IDE -pciide* at pci? flags 0x0000 -#wdc0 at isa? port 0x1f0 irq 14 flags 0x00 -#wdc1 at isa? port 0x170 irq 15 flags 0x00 -#wd* at wdc? flags 0x0000 -wd* at pciide? flags 0x0000 - -#atapiscsi* at wdc? -#atapiscsi* at pciide? - -# SCSI bus support - -# SCSI devices -scsibus* at scsi? -#cd* at scsibus? # SCSI CD-ROM drives -sd* at scsibus? # SCSI disk drives -#st* at scsibus? # SCSI tape drives - -# Workstation Console attachments wsdisplay* at vga? wsdisplay* at tga? wskbd* at pckbd? mux 1 -#pseudo-device bpfilter 1 -pseudo-device loop -pseudo-device rd 1 -pseudo-device wsmux 2 # mouse & keyboard multiplexor +pseudo-device bpfilter 1 +pseudo-device loop 1 +pseudo-device rd 1 +pseudo-device wsmux 2 diff --git a/sys/arch/alpha/conf/RAMDISKB b/sys/arch/alpha/conf/RAMDISKB index 277f32885fe..9b0d777f6e0 100644 --- a/sys/arch/alpha/conf/RAMDISKB +++ b/sys/arch/alpha/conf/RAMDISKB @@ -1,12 +1,22 @@ -# $OpenBSD: RAMDISKB,v 1.42 2014/03/31 04:22:26 deraadt Exp $ -# $NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $ +# $OpenBSD: RAMDISKB,v 1.43 2014/10/10 05:43:33 deraadt Exp $ -machine alpha # architecture, used by config; REQUIRED +machine alpha +maxusers 4 +option TIMEZONE=0 +option DST=0 option SMALL_KERNEL option NO_PROPOLICE +option BOOT_CONFIG + +option RAMDISK_HOOKS +option MINIROOTSIZE=5744 + +option SCSITERSE + +option FFS +option INET -# CPU Support; at least one is REQUIRED #option DEC_3000_500 # Flamingo etc: 3000/[4-9]00* #option DEC_3000_300 # Pelican etc: 3000/300* #option DEC_2100_A50 # Avanti etc: AlphaStation 400, 200, etc. @@ -21,135 +31,64 @@ option NO_PROPOLICE option DEC_6600 # EV6: XP1000, 264DP OEM Board option API_UP1000 # EV6: Alpha Processor UP1000 -# Enable the hooks used for initializing the ram-disk. -option RAMDISK_HOOKS -option MINIROOTSIZE=5744 # 4 Megabytes! - -option NO_IEEE # Disable IEEE math - -# Standard system options -maxusers 8 # estimated number of users - -# File system options -option FFS # Fast file system +option WSKBD_NO_INTL_LAYOUTS # no international keyboard layouts -# Networking options -option INET # Internet protocol suite +config bsd root on rd0a swap on rd0b and wd0b and sd0b -# Misc. options -#option EISAVERBOSE # recognize "unknown" EISA devices -#option PCIVERBOSE # recognize "unknown" PCI devices -#option TCVERBOSE # recognize "unknown" TC devices -option SCSITERSE # less verbose scsi error messages -option WSKBD_NO_INTL_LAYOUTS # no international keyboard layouts +mainbus0 at root +cpu* at mainbus0 +option NO_IEEE # Disable IEEE math -option BOOT_CONFIG +irongate* at mainbus? +tsc* at mainbus0 +tsp* at tsc? + +pci* at irongate? +pci* at tsp? +pci* at ppb? + +ahc* at pci? # AHA-28xx SCSI (NOT 64-BIT) +de* at pci? # 21x4[012]-based Ethernet +dc* at pci? # 21143, "tulip" clone ethernet +siop* at pci? # NCR 53c8xx SCSI +pceb* at pci? # Intel PCI-EISA bridge +vga* at pci? # PCI VGA graphics +ppb* at pci? # PCI-PCI bridges +sio* at pci? # Intel PCI-ISA bridge +tga* at pci? # DEC ZLXp-E[123] graphics + +qlw* at pci? # QLogic ISP SCSI +qla* at pci? # Qlogic ISP 2[123]xx FibreChannel +option ISP_NOFIRMWARE + +amphy* at mii? # AMD 79C873 PHYs +bmtphy* at mii? # Broadcom 10/100 PHYs +dcphy* at mii? # Digital Clone PHYs +lxtphy* at mii? # Level1 LXT970 PHYs +mtdphy* at mii? # Myson MTD972 PHYs +sqphy* at mii? # Seeq 8x220 PHYs +tqphy* at mii? # TDK 78Q212x PHYs +ukphy* at mii? # "unknown" PHYs + +isa* at pceb? +isa* at sio? + +mcclock* at isa? port 0x70 +pckbc* at isa? # PC keyboard controller +pckbd* at pckbc? # PC keyboard (kbd port) +com* at isa? port 0x3f8 irq 4 # standard serial ports +com* at isa? port 0x2f8 irq 3 + +pciide* at pci? flags 0x0000 +wd* at pciide? flags 0x0000 + +scsibus* at scsi? +#cd* at scsibus? # SCSI CD-ROM drives +sd* at scsibus? # SCSI disk drives -config bsd root on rd0a swap on rd0b and wd0b and sd0b - -mainbus0 at root -cpu* at mainbus0 - -# PCI host bus adapter support -#apecs* at mainbus? -#cia* at mainbus? -#lca* at mainbus? -irongate* at mainbus? -tsc* at mainbus0 -tsp* at tsc? - -# PCI bus support -#pci* at apecs? -#pci* at cia? -#pci* at lca? -pci* at irongate? -pci* at tsp? -pci* at ppb? - -# PCI devices -ahc* at pci? # AHA-28xx SCSI (NOT 64-BIT) -de* at pci? # 21x4[012]-based Ethernet -dc* at pci? # 21143, "tulip" clone ethernet -#fxp* at pci? # EtherExpress 10/100B ethernet cards -#ne* at pci? # NE2000-compat ethernet cards -#en* at pci? # ENI PCI ATM (untested) -#ep* at pci? # 3COM 3c59x (untested) -#xl* at pci? # 3COM 3c9xx (untested) -siop* at pci? # NCR 53c8xx SCSI -pceb* at pci? # Intel PCI-EISA bridge -vga* at pci? # PCI VGA graphics -ppb* at pci? # PCI-PCI bridges -sio* at pci? # Intel PCI-ISA bridge -tga* at pci? # DEC ZLXp-E[123] graphics -#pcn* at pci? # AMD PCnet-PCI Ethernet - -qlw* at pci? # QLogic ISP SCSI -qla* at pci? # Qlogic ISP 2[123]xx FibreChannel -option ISP_NOFIRMWARE -#qle* at pci? # Qlogic ISP 2[45]xx FibreChannel -#option QLE_NOFIRMWARE - -# Media Independent Interface (mii) drivers -amphy* at mii? # AMD 79C873 PHYs -bmtphy* at mii? # Broadcom 10/100 PHYs -dcphy* at mii? # Digital Clone PHYs -#exphy* at mii? # 3Com internal PHYs -#inphy* at mii? # Intel 82555 PHYs -#icsphy* at mii? # ICS 1890 PHYs -lxtphy* at mii? # Level1 LXT970 PHYs -mtdphy* at mii? # Myson MTD972 PHYs -#nsphy* at mii? # NS and compatible PHYs -#nsphyter* at mii? # NS and compatible PHYs -#qsphy* at mii? # Quality Semi QS6612 PHYs -sqphy* at mii? # Seeq 8x220 PHYs -tqphy* at mii? # TDK 78Q212x PHYs -ukphy* at mii? # "unknown" PHYs - -# ISA/EISA bus support -isa* at pceb? -isa* at sio? - -# ISA devices -mcclock* at isa? port 0x70 -pckbc* at isa? # PC keyboard controller -pckbd* at pckbc? # PC keyboard (kbd port) -#pms* at pckbc? # PS/2-style mouse (aux port) -com* at isa? port 0x3f8 irq 4 # standard serial ports -com* at isa? port 0x2f8 irq 3 -#lpt* at isa? port 0x3bc irq 7 # standard parallel port -#vga* at isa? # ISA (EISA: XXX) VGA -#we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC 80x3 ethernet series -#we1 at isa? port 0x300 iomem 0xcc000 irq 10 # -#ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3C503 ethernet cards -#ne0 at isa? port 0x240 irq 9 # NE[12]000 ethernet cards -#ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet cards -#ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet cards -#cy0 at isa? iomem 0xd4000 irq 12 # ISA cyclom card - -# IDE -pciide* at pci? flags 0x0000 -#wdc0 at isa? port 0x1f0 irq 14 flags 0x00 -#wdc1 at isa? port 0x170 irq 15 flags 0x00 -#wd* at wdc? flags 0x0000 -wd* at pciide? flags 0x0000 - -#atapiscsi* at wdc? -#atapiscsi* at pciide? - -# SCSI bus support - -# SCSI devices -scsibus* at scsi? -#cd* at scsibus? # SCSI CD-ROM drives -sd* at scsibus? # SCSI disk drives -#st* at scsibus? # SCSI tape drives - -# Workstation Console attachments wsdisplay* at vga? wsdisplay* at tga? wskbd* at pckbd? mux 1 -#pseudo-device bpfilter 1 -pseudo-device loop -pseudo-device rd 1 -#pseudo-device wsmux 2 # mouse & keyboard multiplexor +pseudo-device loop 1 +pseudo-device rd 1 diff --git a/sys/arch/alpha/conf/RAMDISKBIG b/sys/arch/alpha/conf/RAMDISKBIG index 555f24d5276..f10c443ff86 100644 --- a/sys/arch/alpha/conf/RAMDISKBIG +++ b/sys/arch/alpha/conf/RAMDISKBIG @@ -1,14 +1,27 @@ -# $OpenBSD: RAMDISKBIG,v 1.94 2014/04/07 08:27:23 brad Exp $ -# $NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $ -# -# Generic Alpha kernel. Enough to get booted, etc., but not much more. +# $OpenBSD: RAMDISKBIG,v 1.95 2014/10/10 05:43:33 deraadt Exp $ -machine alpha +machine alpha +maxusers 4 +option TIMEZONE=0 +option DST=0 option SMALL_KERNEL option NO_PROPOLICE +option BOOT_CONFIG + +option RAMDISK_HOOKS +option MINIROOTSIZE=5744 + +option EISAVERBOSE +option PCIVERBOSE +option TCVERBOSE + +option FFS +option FFS2 +option CD9660 +option INET +option INET6 -# CPU Support option DEC_3000_500 # Flamingo etc: 3000/[4-9]00* option DEC_3000_300 # Pelican etc: 3000/300* option DEC_2100_A50 # Avanti etc: AlphaStation 400, 200, etc. @@ -24,294 +37,187 @@ option DEC_1000A # Corelle etc: Digital AlphaServer 800/1000A option DEC_6600 # EV6: XP1000, 264DP OEM Board option API_UP1000 # EV6: Alpha Processor UP1000 -# Enable the hooks used for initializing the ram-disk. -option RAMDISK_HOOKS -option MINIROOTSIZE=5744 # 4 Megabytes! - -option NO_IEEE # Disable IEEE math - -# Standard system options -maxusers 8 # estimated number of users - -# File system options -option FFS # Fast file system -option FFS2 # Fast file system 2 -option CD9660 # ISO 9660 + Rock Ridge file system - -# Networking options -option INET # Internet protocol suite -option INET6 # IPv6 (needs INET) - -# Misc. options -option EISAVERBOSE # recognize "unknown" EISA devices -option PCIVERBOSE # recognize "unknown" PCI devices -option TCVERBOSE # recognize "unknown" TC devices -#option USBVERBOSE - -option BOOT_CONFIG - -config bsd root on rd0a swap on rd0b and wd0b and sd0b - -mainbus0 at root -cpu* at mainbus0 - -# PCI USB Controllers -ehci* at pci? # Enhanced Host Controller -uhci* at pci? # Universal Host Controller (Intel) -ohci* at pci? # Open Host Controller - -# USB bus support -usb* at ehci? -usb* at uhci? -usb* at ohci? - -# USB Hubs -uhub* at usb? -uhub* at uhub? - -# USB Generic HID devices -uhidev* at uhub? -uhid* at uhidev? # USB Generic HID devices - -# USB Printers -#ulpt* at uhub? - -# USB Mass Storage devices -umass* at uhub? - -# USB Modems -#umodem* at uhub? -#ucom* at umodem? - -# USB Audio -#uaudio* at uhub? - -# USB Ethernet adapters -aue* at uhub? # ADMtek AN986 Pegasus Ethernet -axe* at uhub? # ASIX Electronics AX88172 USB Ethernet -axen* at uhub? # ASIX Electronics AX88179 USB Ethernet -cdce* at uhub? # CDC Ethernet -cue* at uhub? # CATC USB-EL1201A based Ethernet -kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet -smsc* at uhub? # SMSC LAN95xx Ethernet -udav* at uhub? # Davicom DM9601 based Ethernet -upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' -ugl* at uhub? # Genesys Logic GL620USB-A host-to-host `network' -url* at uhub? # Realtek RTL8150L based adapters -wi* at uhub? # WaveLAN IEEE 802.11DS -# Diamond Multimedia Rio 500 -#urio* at uhub? +config bsd root on rd0a swap on rd0b and wd0b and sd0b -# Handspring Visor -#uvisor* at uhub? -#ucom* at uvisor? - -# USB Generic driver -ugen* at uhub? - -# MCBUS bus support -mcbus* at mainbus0 -mcmem* at mcbus? mid ? - -# TurboChannel host bus adapter support -tcasic* at mainbus0 - -# TurboChannel bus support -tc* at tcasic? - -# TurboChannel devices -ioasic* at tc? -mcclock* at ioasic? -le* at ioasic? -scc0 at ioasic? -scc1 at ioasic? -tcds* at tc? -asc* at tcds? -asc* at tc? -#cfb* at tc? -#sfb* at tc? -le* at tc? - -# PCI host bus adapter support -apecs* at mainbus? -cia* at mainbus? -irongate* at mainbus? -lca* at mainbus? -tsc* at mainbus0 -tsp* at tsc? -mcpcia* at mcbus? mid? - -# PCI bus support -pci* at apecs? -pci* at cia? -pci* at irongate? -pci* at lca? -pci* at ppb? -pci* at tsp? -pci* at mcpcia? - -# PCI devices -ppb* at pci? # PCI-PCI bridges -sio* at pci? # Intel PCI-ISA bridge -pceb* at pci? # Intel PCI-EISA bridge - -cy* at pci? # PCI cyclom card - -# PCI SCSI devices -ahc* at pci? # Adaptec 2940 SCSI controllers -qlw* at pci? # QLogic ISP SCSI -qla* at pci? # Qlogic ISP 2[123]xx SCSI/FibreChannel -qle* at pci? # Qlogic ISP 2[45]xx SCSI/FibreChannel -siop* at pci? # NCR 53c8xx SCSI -pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI -twe* at pci? # 3ware Escalade RAID controllers -softraid0 at root # Software RAID - -#UNTESTED: the following drivers are untested. -adw* at pci? # AdvanSys ULTRA WIDE SCSI -ciss* at pci? # Compaq Smart ARRAY [56]* RAID controllers -gdt* at pci? # ICP Vortex GDT RAID controllers -#adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI - -# PCI Network devices -pcn* at pci? # AMD PCnet-PCI Ethernet -de* at pci? # 21x4[012]-based Ethernet -dc* at pci? # 21143, "tulip" clone ethernet -ne* at pci? # NE2000-compat ethernet cards -fxp* at pci? # EtherExpress 10/100B ethernet -ep* at pci? # 3COM 3c59x -xl* at pci? # 3COM 3c9xx -txp* at pci? # 3COM 3CR990 -bge* at pci? # Broadcom BCM570x (aka Tigon3) -vge* at pci? # VIA VT612x -re* at pci? # Realtek 8169/8169S/8110S -stge* at pci? # Sundance TC9021 GigE -lge* at pci? # Level1 LXT1001 GigE -hme* at pci? # Sun Happy Meal -ti* at pci? # Alteon Tigon 1Gb ethernet -rl* at pci? # RealTek 81[23]9 ethernet -vr* at pci? # VIA Rhine ethernet -em* at pci? # Intel Pro/1000 ethernet -#ixgb* at pci? # Intel Pro/10Gb ethernet -sis* at pci? # SiS 900/7016 ethernet -mtd* at pci? # Myson MTD800/803/891 -epic* at pci? # SMC EPIC/100 ethernet -skc* at pci? # SysKonnect GEnesis 984x -sk* at skc? # each port of above -mskc* at pci? # Marvell Yukon-2 -msk* at mskc? # each port of above -tl* at pci? # Compaq Thunderlan ethernet -ste* at pci? # Sundance ST201 ethernet -ral* at pci? # Ralink RT2500/RT2501/RT2600 -xge* at pci? # Neterion Xframe-I/II 10Gb ethernet -sf* at pci? # Adaptec AIC-6915 ethernet - -#en* at pci? # ENI PCI ATM (untested) -wb* at pci? # Winbond W89C840F ethernet -an* at pci? # Cisco/Aironet 802.11DS - -vga* at pci? # PCI VGA graphics -tga* at pci? # DEC ZLXp-E[123] graphics - -# Media Independent Interface (mii) drivers -eephy* at mii? # Marvell PHYs -exphy* at mii? # 3Com internal PHYs -inphy* at mii? # Intel 82555 PHYs -iophy* at mii? # Intel 82553 PHYs -icsphy* at mii? # ICS 1890 PHYs -lxtphy* at mii? # Level1 LXT970 PHYs -nsphy* at mii? # NS and compatible PHYs -nsphyter* at mii? # NS and compatible PHYs -qsphy* at mii? # Quality Semi QS6612 PHYs -luphy* at mii? # Lucent LU6612 PHY -sqphy* at mii? # Seeq 8x220 PHYs -tlphy* at mii? # ThunderLAN PHYs -rlphy* at mii? # RealTek 8139 internal PHYs -mtdphy* at mii? # Myson MTD972 PHYs -dcphy* at mii? # Digital Clone PHYs -acphy* at mii? # Altima AC101 PHYs -amphy* at mii? # AMD 79C873 PHYs -tqphy* at mii? # TDK 78Q212x PHYs -bmtphy* at mii? # Broadcom 10/100 PHYs -brgphy* at mii? # Broadcom Gigabit PHYs -xmphy* at mii? # XaQti XMAC-II PHYs -urlphy* at mii? # Realtek RTL8150L internal PHY -rgephy* at mii? # Realtek 8169S/8110S PHY -ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY -ipgphy* at mii? # IC Plus IP1000A PHYs -mlphy* at mii? # Micro Linear 6692 PHY -ukphy* at mii? # "unknown" PHYs - -# ISA/EISA bus support -isa* at pceb? -eisa* at pceb? -isa* at sio? -isadma0 at isa? -isapnp0 at isa? - -# ISA devices -mcclock* at isa? port 0x70 -#pcppi* at isa? # PC prog. periph. interface -#spkr0 at pcppi? -pckbc* at isa? # PC keyboard controller -pckbd* at pckbc? # PC keyboard (kbd port) -pms* at pckbc? # PS/2-style mouse (aux port) -com* at isa? port 0x3f8 irq 4 # standard serial ports -com* at isa? port 0x2f8 irq 3 -#lpt* at isa? port 0x3bc irq 7 # standard parallel port -vga* at isa? # ISA (EISA: XXX) VGA -we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC 80x3 ethernet -we1 at isa? port 0x300 iomem 0xcc000 irq 10 # -ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3C503 ethernet cards -ne0 at isa? port 0x240 irq 9 # NE[12]000 ethernet cards -ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet cards -ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet cards -ep* at isa? # 3C509 ethernet cards -ep* at isapnp? -#wss* at isa? port 0x530 irq 9 drq 0 # Windows Sound System -lc0 at isa? port 0x200 # DEC EtherWorks -lc1 at isa? port 0x280 # DEC EtherWorks - -cy0 at isa? iomem 0xd4000 irq 12 # ISA cyclom card - -#aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI - -#ahc0 at isa? # Adaptec 284x SCSI controllers - -# EISA devices -ahc* at eisa? # Adaptec 274x, aic7770 SCSI - -# SCSI devices -scsibus* at scsi? -cd* at scsibus? -sd* at scsibus? -st* at scsibus? -ch* at scsibus? -uk* at scsibus? - -# IDE controllers -pciide* at pci? flags 0x0000 -#wdc0 at isa? port 0x1f0 irq 14 flags 0x00 -#wdc1 at isa? port 0x170 irq 15 flags 0x00 -#wd* at wdc? flags 0x0000 -wd* at pciide? flags 0x0000 +mainbus0 at root +cpu* at mainbus0 +option NO_IEEE # Disable IEEE math -# ATAPI<->SCSI -#atapiscsi* at wdc? -atapiscsi* at pciide? +ehci* at pci? +uhci* at pci? +ohci* at pci? +usb* at ehci? +usb* at uhci? +usb* at ohci? + +uhub* at usb? +uhub* at uhub? +uhidev* at uhub? +uhid* at uhidev? # USB Generic HID devices +umass* at uhub? +aue* at uhub? # ADMtek AN986 Pegasus Ethernet +axe* at uhub? # ASIX Electronics AX88172 USB Ethernet +axen* at uhub? # ASIX Electronics AX88179 USB Ethernet +cdce* at uhub? # CDC Ethernet +cue* at uhub? # CATC USB-EL1201A based Ethernet +kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet +smsc* at uhub? # SMSC LAN95xx Ethernet +udav* at uhub? # Davicom DM9601 based Ethernet +upl* at uhub? # Prolific PL2301/PL2302 host-to-host +ugl* at uhub? # Genesys Logic GL620USB-A host-to-host +url* at uhub? # Realtek RTL8150L based adapters +wi* at uhub? # WaveLAN IEEE 802.11DS + +mcbus* at mainbus0 +mcmem* at mcbus? mid ? + +tcasic* at mainbus0 +tc* at tcasic? +ioasic* at tc? +mcclock* at ioasic? +le* at ioasic? +scc0 at ioasic? +scc1 at ioasic? +tcds* at tc? +asc* at tcds? +asc* at tc? +#cfb* at tc? +#sfb* at tc? +le* at tc? + +apecs* at mainbus? +cia* at mainbus? +irongate* at mainbus? +lca* at mainbus? +tsc* at mainbus0 +tsp* at tsc? +mcpcia* at mcbus? mid? + +pci* at apecs? +pci* at cia? +pci* at irongate? +pci* at lca? +pci* at ppb? +pci* at tsp? +pci* at mcpcia? + +ppb* at pci? +sio* at pci? # Intel PCI-ISA bridge +pceb* at pci? # Intel PCI-EISA bridge + +ahc* at pci? # Adaptec 2940 SCSI controllers +qlw* at pci? # QLogic ISP SCSI +qla* at pci? # Qlogic ISP 2[123]xx SCSI/FibreChannel +qle* at pci? # Qlogic ISP 2[45]xx SCSI/FibreChannel +siop* at pci? # NCR 53c8xx SCSI +pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI +twe* at pci? # 3ware Escalade RAID controllers +softraid0 at root +adw* at pci? # AdvanSys ULTRA WIDE SCSI +ciss* at pci? # Compaq Smart ARRAY [56]* RAID +gdt* at pci? # ICP Vortex GDT RAID controllers + +pcn* at pci? # AMD PCnet-PCI Ethernet +de* at pci? # 21x4[012]-based Ethernet +dc* at pci? # 21143, "tulip" clone ethernet +ne* at pci? # NE2000-compat ethernet cards +fxp* at pci? # EtherExpress 10/100B ethernet +ep* at pci? # 3COM 3c59x +xl* at pci? # 3COM 3c9xx +txp* at pci? # 3COM 3CR990 +bge* at pci? # Broadcom BCM570x (aka Tigon3) +vge* at pci? # VIA VT612x +re* at pci? # Realtek 8169/8169S/8110S +stge* at pci? # Sundance TC9021 GigE +lge* at pci? # Level1 LXT1001 GigE +hme* at pci? # Sun Happy Meal +ti* at pci? # Alteon Tigon 1Gb ethernet +rl* at pci? # RealTek 81[23]9 ethernet +vr* at pci? # VIA Rhine ethernet +em* at pci? # Intel Pro/1000 ethernet +sis* at pci? # SiS 900/7016 ethernet +mtd* at pci? # Myson MTD800/803/891 +epic* at pci? # SMC EPIC/100 ethernet +skc* at pci? # SysKonnect GEnesis 984x +sk* at skc? # each port of above +mskc* at pci? # Marvell Yukon-2 +msk* at mskc? # each port of above +tl* at pci? # Compaq Thunderlan ethernet +ste* at pci? # Sundance ST201 ethernet +ral* at pci? # Ralink RT2500/RT2501/RT2600 +xge* at pci? # Neterion Xframe-I/II 10Gb ethernet +sf* at pci? # Adaptec AIC-6915 ethernet +wb* at pci? # Winbond W89C840F ethernet +an* at pci? # Cisco/Aironet 802.11DS + +vga* at pci? # PCI VGA graphics +tga* at pci? # DEC ZLXp-E[123] graphics + +eephy* at mii? # Marvell PHYs +exphy* at mii? # 3Com internal PHYs +inphy* at mii? # Intel 82555 PHYs +iophy* at mii? # Intel 82553 PHYs +icsphy* at mii? # ICS 1890 PHYs +lxtphy* at mii? # Level1 LXT970 PHYs +nsphy* at mii? # NS and compatible PHYs +nsphyter* at mii? # NS and compatible PHYs +qsphy* at mii? # Quality Semi QS6612 PHYs +luphy* at mii? # Lucent LU6612 PHY +sqphy* at mii? # Seeq 8x220 PHYs +tlphy* at mii? # ThunderLAN PHYs +rlphy* at mii? # RealTek 8139 internal PHYs +mtdphy* at mii? # Myson MTD972 PHYs +dcphy* at mii? # Digital Clone PHYs +acphy* at mii? # Altima AC101 PHYs +amphy* at mii? # AMD 79C873 PHYs +tqphy* at mii? # TDK 78Q212x PHYs +bmtphy* at mii? # Broadcom 10/100 PHYs +brgphy* at mii? # Broadcom Gigabit PHYs +xmphy* at mii? # XaQti XMAC-II PHYs +urlphy* at mii? # Realtek RTL8150L internal PHY +rgephy* at mii? # Realtek 8169S/8110S PHY +ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY +ipgphy* at mii? # IC Plus IP1000A PHYs +mlphy* at mii? # Micro Linear 6692 PHY +ukphy* at mii? # "unknown" PHYs + +isa* at pceb? +eisa* at pceb? +isa* at sio? +isadma0 at isa? +isapnp0 at isa? + +mcclock* at isa? port 0x70 +pckbc* at isa? # PC keyboard controller +pckbd* at pckbc? # PC keyboard (kbd port) +com* at isa? port 0x3f8 irq 4 # standard serial ports +com* at isa? port 0x2f8 irq 3 +vga* at isa? # ISA (EISA: XXX) VGA +ep* at isa? # 3C509 ethernet cards +ep* at isapnp? +lc0 at isa? port 0x200 # DEC EtherWorks +lc1 at isa? port 0x280 # DEC EtherWorks +ahc* at eisa? # Adaptec 274x, aic7770 SCSI + +scsibus* at scsi? +cd* at scsibus? +sd* at scsibus? +st* at scsibus? + +pciide* at pci? flags 0x0000 +wd* at pciide? flags 0x0000 +atapiscsi* at pciide? -# Workstation Console attachments #wsdisplay* at cfb? #wsdisplay* at sfb? wsdisplay* at vga? wsdisplay* at tga? wskbd* at pckbd? mux 1 -wsmouse* at pms? mux 0 -pseudo-device bpfilter 1 -pseudo-device vlan # IEEE 802.1Q VLAN -pseudo-device loop -pseudo-device rd 1 -pseudo-device wsmux 2 -pseudo-device bio 1 # ioctl multiplexing device +pseudo-device bpfilter 1 +pseudo-device vlan +pseudo-device loop 1 +pseudo-device rd 1 +pseudo-device wsmux 2 +pseudo-device bio 1 diff --git a/sys/arch/alpha/conf/RAMDISKC b/sys/arch/alpha/conf/RAMDISKC index c00dd9e9a97..7345c406439 100644 --- a/sys/arch/alpha/conf/RAMDISKC +++ b/sys/arch/alpha/conf/RAMDISKC @@ -1,150 +1,75 @@ -# $OpenBSD: RAMDISKC,v 1.6 2014/03/31 04:22:26 deraadt Exp $ +# $OpenBSD: RAMDISKC,v 1.7 2014/10/10 05:43:33 deraadt Exp $ -machine alpha # architecture, used by config; REQUIRED +machine alpha +maxusers 4 +option TIMEZONE=0 +option DST=0 option SMALL_KERNEL option NO_PROPOLICE +option BOOT_CONFIG -# CPU Support; at least one is REQUIRED -option DEC_ALPHABOOK1 # AlphaBook1: Tadpole/DEC AlphaBook - -# Enable the hooks used for initializing the ram-disk. option RAMDISK_HOOKS -option MINIROOTSIZE=5744 # 4 Megabytes! +option MINIROOTSIZE=5744 + +option SCSITERSE + +option FFS +option INET + +option WSKBD_NO_INTL_LAYOUTS # no international keyboard layouts + +config bsd root on rd0a swap on rd0b and wd0b and sd0b +mainbus0 at root +cpu* at mainbus0 +option DEC_ALPHABOOK1 # AlphaBook1: Tadpole/DEC AlphaBook option NO_IEEE # Disable IEEE math -# Standard system options -maxusers 8 # estimated number of users +lca* at mainbus? -# File system options -option FFS # Fast file system +pci* at lca? +pci* at ppb? -# Networking options -option INET # Internet protocol suite +siop* at pci? # NCR 53c8xx SCSI +pceb* at pci? # Intel PCI-EISA bridge +vga* at pci? # PCI VGA graphics +ppb* at pci? # PCI-PCI bridges +sio* at pci? # Intel PCI-ISA bridge +tga* at pci? # DEC ZLXp-E[123] graphics -# Misc. options -#option EISAVERBOSE # recognize "unknown" EISA devices -#option PCIVERBOSE # recognize "unknown" PCI devices -#option TCVERBOSE # recognize "unknown" TC devices -option SCSITERSE # less verbose scsi error messages -option WSKBD_NO_INTL_LAYOUTS # no international keyboard layouts +qla* at pci? # Qlogic ISP 2[123]xx FibreChannel +option ISP_NOFIRMWARE -option BOOT_CONFIG +tqphy* at mii? # TDK 78Q212x PHYs +ukphy* at mii? # "unknown" PHYs + +isa* at pceb? +isa* at sio? + +mcclock* at isa? port 0x70 +pckbc* at isa? # PC keyboard controller +pckbd* at pckbc? # PC keyboard (kbd port) +com* at isa? port 0x3f8 irq 4 # standard serial ports +com* at isa? port 0x2f8 irq 3 +vga* at isa? # ISA (EISA: XXX) VGA + +pciide* at pci? flags 0x0000 +wd* at pciide? flags 0x0000 +pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000 +pcic1 at isa? port 0x3e2 iomem 0xcc000 iosiz 0x10000 + +pcmcia* at pcic? controller ? socket ? +ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Eth. + +scsibus* at scsi? +#cd* at scsibus? # SCSI CD-ROM drives +sd* at scsibus? # SCSI disk drives -config bsd root on rd0a swap on rd0b and wd0b and sd0b - -mainbus0 at root -cpu* at mainbus0 - -# MCBUS bus support -#mcbus* at mainbus? -#mcmem* at mcbus? mid? - -# PCI host bus adapter support -#apecs* at mainbus? -#cia* at mainbus? -lca* at mainbus? -#irongate* at mainbus? -#tsc* at mainbus0 -#tsp* at tsc? -#mcpcia* at mcbus? mid? - -# PCI bus support -#pci* at apecs? -#pci* at cia? -pci* at lca? -pci* at ppb? -#pci* at irongate? -#pci* at tsp? -#pci* at mcpcia? - -# PCI devices -#ahc* at pci? # AHA-28xx SCSI (NOT 64-BIT) -#de* at pci? # 21x4[012]-based Ethernet -#dc* at pci? # 21143, "tulip" clone ethernet -#fxp* at pci? # EtherExpress 10/100B ethernet cards -#ne* at pci? # NE2000-compat ethernet cards -#en* at pci? # ENI PCI ATM (untested) -#ep* at pci? # 3COM 3c59x (untested) -#xl* at pci? # 3COM 3c9xx (untested) -siop* at pci? # NCR 53c8xx SCSI -pceb* at pci? # Intel PCI-EISA bridge -vga* at pci? # PCI VGA graphics -ppb* at pci? # PCI-PCI bridges -sio* at pci? # Intel PCI-ISA bridge -tga* at pci? # DEC ZLXp-E[123] graphics -#pcn* at pci? # AMD PCnet-PCI Ethernet - -qla* at pci? # Qlogic ISP 2[123]xx FibreChannel -option ISP_NOFIRMWARE -#qle* at pci? # Qlogic ISP 2[45]xx FibreChannel -#option QLE_NOFIRMWARE - -# Media Independent Interface (mii) drivers -#amphy* at mii? # AMD 79C873 PHYs -#bmtphy* at mii? # Broadcom 10/100 PHYs -#dcphy* at mii? # Digital Clone PHYs -#exphy* at mii? # 3Com internal PHYs -#inphy* at mii? # Intel 82555 PHYs -#icsphy* at mii? # ICS 1890 PHYs -#lxtphy* at mii? # Level1 LXT970 PHYs -#mtdphy* at mii? # Myson MTD972 PHYs -#nsphy* at mii? # NS and compatible PHYs -#nsphyter* at mii? # NS and compatible PHYs -#qsphy* at mii? # Quality Semi QS6612 PHYs -#sqphy* at mii? # Seeq 8x220 PHYs -tqphy* at mii? # TDK 78Q212x PHYs -ukphy* at mii? # "unknown" PHYs - -# ISA/EISA bus support -isa* at pceb? -isa* at sio? - -# ISA devices -mcclock* at isa? port 0x70 -pckbc* at isa? # PC keyboard controller -pckbd* at pckbc? # PC keyboard (kbd port) -com* at isa? port 0x3f8 irq 4 # standard serial ports -com* at isa? port 0x2f8 irq 3 -vga* at isa? # ISA (EISA: XXX) VGA -#we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC 80x3 ethernet series -#we1 at isa? port 0x300 iomem 0xcc000 irq 10 # -#ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3C503 ethernet cards -#ne0 at isa? port 0x240 irq 9 # NE[12]000 ethernet cards -#ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet cards -#ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet cards -#cy0 at isa? iomem 0xd4000 irq 12 # ISA cyclom card - -# IDE -pciide* at pci? flags 0x0000 -#wdc0 at isa? port 0x1f0 irq 14 flags 0x00 -#wdc1 at isa? port 0x170 irq 15 flags 0x00 -#wd* at wdc? flags 0x0000 -wd* at pciide? flags 0x0000 -pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000 -pcic1 at isa? port 0x3e2 iomem 0xcc000 iosiz 0x10000 - -pcmcia* at pcic? controller ? socket ? -ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Eth. - -#atapiscsi* at wdc? -#atapiscsi* at pciide? - -# SCSI bus support - -# SCSI devices -scsibus* at scsi? -#cd* at scsibus? # SCSI CD-ROM drives -sd* at scsibus? # SCSI disk drives -#st* at scsibus? # SCSI tape drives - -# Workstation Console attachments wsdisplay* at vga? wsdisplay* at tga? wskbd* at pckbd? mux 1 -#pseudo-device bpfilter 1 -pseudo-device loop -pseudo-device rd 1 -pseudo-device wsmux 2 # mouse & keyboard multiplexor +pseudo-device loop 1 +pseudo-device rd 1 +pseudo-device wsmux 2 diff --git a/sys/arch/amd64/conf/RAMDISK b/sys/arch/amd64/conf/RAMDISK index 315b6d9422e..f1d446aa324 100644 --- a/sys/arch/amd64/conf/RAMDISK +++ b/sys/arch/amd64/conf/RAMDISK @@ -1,37 +1,27 @@ -# $OpenBSD: RAMDISK,v 1.63 2014/07/15 22:12:10 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.64 2014/10/10 05:43:35 deraadt Exp $ -machine amd64 # architecture, used by config; REQUIRED +machine amd64 +maxusers 4 -option SCSITERSE +option TIMEZONE=0 +option DST=0 option SMALL_KERNEL option NO_PROPOLICE - -maxusers 4 # estimated number of users -option TIMEZONE=0 # time zone to adjust RTC time by -option DST=0 # daylight saving time used by RTC - -#makeoptions DEBUG="-g" # compile full symbol table - -option FFS # UFS -#option EXT2FS # Linux ext2fs - -#option NFSCLIENT # Network File System client - -#option CD9660 # ISO 9660 + Rock Ridge file system -#option MSDOSFS # MS-DOS file system - -option INET # IP + ICMP + TCP + UDP -#option INET6 # IPv6 (needs INET) - -option BOOT_CONFIG # boot-time kernel config +option BOOT_CONFIG option RAMDISK_HOOKS option MINIROOTSIZE=4480 -config bsd root on rd0a swap on rd0b and wd0b and sd0b +option PCIVERBOSE +option SCSITERSE + +option FFS +option INET + +config bsd root on rd0a swap on rd0b and wd0b and sd0b -mainbus0 at root -bios0 at mainbus? +mainbus0 at root +bios0 at mainbus? acpi0 at bios? #acpitimer* at acpi? @@ -47,67 +37,32 @@ acpimadt0 at acpi? mpbios0 at bios0 -cpu0 at mainbus0 -ioapic* at mainbus? -isa0 at mainbus0 -#isa0 at pcib? -pci* at mainbus0 - -option PCIVERBOSE - -pchb* at pci? # PCI-Host bridges -aapic* at pci? # AMD 8131 IO apic -ppb* at pci? # PCI-PCI bridges -pci* at ppb? -pci* at pchb? -#pcib* at pci? # PCI-ISA bridge - -# CardBus bus support -#cardbus* at cardslot? -#pcmcia* at cardslot? -#cbb* at pci? -#cardslot* at cbb? - -# PCI PCMCIA controllers -#pcic* at pci? - -# PCMCIA bus support -#pcmcia* at pcic? - -# PCI USB Controllers -ehci* at pci? # Enhanced Host Controller -uhci* at pci? # Universal Host Controller (Intel) -ohci* at pci? # Open Host Controller - -# USB bus support -usb* at ehci? -usb* at uhci? -usb* at ohci? - -uhub* at usb? # USB Hubs -uhub* at uhub? # USB Hubs -#uhid* at uhub? # USB Generic HID devices -#umodem* at uhub? # USB Modems/Serial -#ucom* at umodem? -#uvisor* at uhub? # Handspring Visor -#ucom* at uvisor? -#uftdi* at uhub? -#ucom* at uftdi? -#uaudio* at uhub? # USB Audio -#ulpt* at uhub? # USB Printers -uhidev* at uhub? -ukbd* at uhidev? -wskbd* at ukbd? mux 1 -#umass* at uhub? # USB Mass Storage devices -#ums* at uhidev? -#wsmouse* at ums? mux 0 -#aue* at uhub? # ADMtek AN986 Pegasus Ethernet -#cue* at uhub? # CATC USB-EL1201A based Ethernet -#kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet -#upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' -#ugl* at uhub? # Genesys Logic GL620USB-A host-to-host `network' -#urio* at uhub? # Diamond Multimedia Rio 500 -#ugen* at uhub? # USB Generic driver +cpu0 at mainbus0 +ioapic* at mainbus? +isa0 at mainbus0 +#isa0 at pcib? +pci* at mainbus0 + +pchb* at pci? # PCI-Host bridges +aapic* at pci? # AMD 8131 IO apic +ppb* at pci? # PCI-PCI bridges +pci* at ppb? +pci* at pchb? +#pcib* at pci? # PCI-ISA bridge + +ehci* at pci? +uhci* at pci? +ohci* at pci? +usb* at ehci? +usb* at uhci? +usb* at ohci? + +uhub* at usb? +uhub* at uhub? +uhidev* at uhub? +ukbd* at uhidev? +wskbd* at ukbd? mux 1 +umass* at uhub? pckbc0 at isa? # PC keyboard controller pckbd* at pckbc? # PC keyboard @@ -116,131 +71,38 @@ vga0 at isa? vga* at pci? wsdisplay* at vga? -com0 at isa? port 0x3f8 irq 4 # standard PC serial ports -com1 at isa? port 0x2f8 irq 3 - -#com* at pcmcia? # PCMCIA modem cards - -# option for using CD1400 handshaking for incoming data -# requires a special cable that exchanges the RTS and DTR lines -# options CY_HW_RTS -#cy* at pci? # PCI cyclom card - -#lpt0 at isa? port 0x378 irq 7 # standard PC parallel ports -#lpt1 at isa? port 0x278 -#lpt2 at isa? port 0x3bc - -#bha* at pci? -#ahc* at pci? # Adaptec 2940 SCSI controllers -#ahd* at pci? # Adaptec 79?? SCSI controllers -mpi* at pci? # LSI Logic Message Passing Interface -#gdt* at pci? # ICP Vortex GDT RAID controllers -#aac* at pci? # Adaptec FSA RAID controllers -#ami* at pci? # AMI MegaRAID controllers -mfi* at pci? # LSI MegaRAID SAS controllers -#cac* at pci? # Compaq Smart ARRAY [234]* RAID controllers -#ciss* at pci? # Compaq Smart ARRAY [56]* RAID controllers -#twe* at pci? # 3ware Escalade RAID controllers -#iha* at pci? # Initio Ultra/UltraWide SCSI controllers -#aic* at pcmcia? # PCMCIA Adaptec 152[02] SCSI -#siop* at pci? # NCR 538XX SCSI controllers(new) -#adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI -#adw* at pci? # AdvanSys ULTRA WIDE SCSI -#pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI -#trm* at pci? # Tekram DC-3x5U SCSI Controllers - -# I2O -#iop* at pci? # I2O processor -#ioprbs* at iop? # I2O arrays -#iopsp* at iop? # I2O SCSI pass-through - -scsibus* at scsi? -sd* at scsibus? # SCSI disk drives -#st* at scsibus? # SCSI tape drives -cd* at scsibus? # SCSI CD-ROM drives -#ch* at scsibus? # SCSI autochangers -#uk* at scsibus? # SCSI unknown devices - -#fdc0 at isa? port 0x3f0 irq 6 drq 2 # standard PC floppy controllers -#fdc1 at isa? port 0x370 -#fd* at fdc? - -# IDE controllers -pciide* at pci? flags 0x0000 - -#wdc* at pcmcia? - -# IDE hard drives -#wd* at wdc? flags 0x0000 -wd* at pciide? flags 0x0000 - -# ATAPI<->SCSI -#atapiscsi* at wdc? -atapiscsi* at pciide? - -#de* at pci? # DC21X4X-based ethernet -fxp* at pci? # EtherExpress 10/100B ethernet -#fxp* at cardbus? # Intel PRO/100 ethernet -#ep* at pci? # 3C59x ethernet -#ne* at pci? # NE2000-compat ethernet -#ne* at pcmcia? # PCMCIA based NE2000 ethernet -#ep* at pcmcia? # PCMCIA based 3C5xx ethernet -#sm* at pcmcia? # PCMCIA based sm ethernet -#xe* at pcmcia? # Xircom ethernet -#xl* at pci? # 3C9xx ethernet -#xl* at cardbus? # 3C575 ethernet -rl* at pci? # RealTek 81[23]9 ethernet -re* at pci? # Realtek 8169/8169S/8110S -#epic* at pci? # SMC EPIC/100 ethernet -#tl* at pci? # Compaq Thunderlan ethernet -#vr* at pci? # VIA Rhine ethernet -#dc* at pci? # 21143, "tulip" clone ethernet -#sis* at pci? # SiS 900/7016 ethernet -#wb* at pci? # Winbond W89C840F ethernet -#ti* at pci? # Alteon Tigon 1Gb ethernet -#skc* at pci? # SysKonnect GEnesis 984x -#sk* at skc? # each port of above -em* at pci? # Intel Pro/1000 ethernet -#txp* at pci? # 3com 3CR990 -#nge* at pci? # NS DP83820/DP83821 GigE -bge* at pci? # Broadcom BCM570x (aka Tigon3) -#lge* at pci? # Level1 LXT1001 GigE -#mtd* at pci? # Myson MTD803 -#vge* at pci? # VIA VT612x -nfe* at pci? # NVIDIA nForce Ethernet -#pcn* at pci? # AMD PCnet-PCI Ethernet - -# Wireless network cards -#wi* at pci? # WaveLAN IEEE 802.11DS -#wi* at pcmcia? # WaveLAN IEEE 802.11DS -#an* at pcmcia? # Aironet IEEE 802.11DS -#cnw* at pcmcia? # Xircom Netwave - -# Media Independent Interface (mii) drivers -#exphy* at mii? # 3Com internal PHYs -inphy* at mii? # Intel 82555 PHYs -iophy* at mii? # Intel 82553 PHYs -#icsphy* at mii? # ICS 1890 PHYs -lxtphy* at mii? # Level1 LXT970 PHYs -nsphy* at mii? # NS and compatible PHYs -nsphyter* at mii? # NS and compatible PHYs -#qsphy* at mii? # Quality Semi QS6612 PHYs -#sqphy* at mii? # Seeq 8x220 PHYs -rlphy* at mii? # RealTek 8139 internal PHYs -#mtdphy* at mii? # Myson MTD972 PHYs -#dcphy* at mii? # Digital Clone PHYs -#acphy* at mii? # Altima AC101 PHYs -#amphy* at mii? # AMD 79C873 PHYs -#tqphy* at mii? # TDK 78Q212x PHYs -brgphy* at mii? # Broadcom Gigabit PHYs -#eephy* at mii? # Marvell 88E1000 series PHY -#xmphy* at mii? # XaQti XMAC-II PHYs -#bmtphy* at mii? # Broadcom 10/100 PHYs -rgephy* at mii? # Realtek 8169S/8110S PHY -ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY -ukphy* at mii? # "unknown" PHYs - -pseudo-device loop 1 # network loopback -pseudo-device bpfilter 1 # packet filter -pseudo-device rd 1 # ramdisk -pseudo-device wsmux 2 +com0 at isa? port 0x3f8 irq 4 # standard PC serial ports +com1 at isa? port 0x2f8 irq 3 + +mpi* at pci? # LSI Logic Message Passing Interface +mfi* at pci? # LSI MegaRAID SAS controllers + +scsibus* at scsi? +sd* at scsibus? # SCSI disk drives +cd* at scsibus? # SCSI CD-ROM drives + +pciide* at pci? flags 0x0000 +wd* at pciide? flags 0x0000 +atapiscsi* at pciide? + +fxp* at pci? # EtherExpress 10/100B ethernet +rl* at pci? # RealTek 81[23]9 ethernet +re* at pci? # Realtek 8169/8169S/8110S +em* at pci? # Intel Pro/1000 ethernet +bge* at pci? # Broadcom BCM570x (aka Tigon3) + +inphy* at mii? # Intel 82555 PHYs +iophy* at mii? # Intel 82553 PHYs +lxtphy* at mii? # Level1 LXT970 PHYs +nsphy* at mii? # NS and compatible PHYs +nsphyter* at mii? # NS and compatible PHYs +rlphy* at mii? # RealTek 8139 internal PHYs +brgphy* at mii? # Broadcom Gigabit PHYs +rgephy* at mii? # Realtek 8169S/8110S PHY +ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY +ukphy* at mii? # "unknown" PHYs + +pseudo-device loop 1 +pseudo-device bpfilter 1 +pseudo-device rd 1 +pseudo-device wsmux 2 diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD index ce441c0915e..96ac6d1d53f 100644 --- a/sys/arch/amd64/conf/RAMDISK_CD +++ b/sys/arch/amd64/conf/RAMDISK_CD @@ -1,40 +1,35 @@ -# $OpenBSD: RAMDISK_CD,v 1.144 2014/07/16 14:59:41 naddy Exp $ +# $OpenBSD: RAMDISK_CD,v 1.145 2014/10/10 05:43:35 deraadt Exp $ -machine amd64 # architecture, used by config; REQUIRED +machine amd64 +maxusers 4 -option SCSITERSE +option TIMEZONE=0 +option DST=0 option SMALL_KERNEL option NO_PROPOLICE +option BOOT_CONFIG -maxusers 4 # estimated number of users -option TIMEZONE=0 # time zone to adjust RTC time by -option DST=0 # daylight saving time used by RTC - -#makeoptions DEBUG="-g" # compile full symbol table - -option FFS # UFS -option FFS2 # UFS2 -option EXT2FS # Linux ext2fs - -option NFSCLIENT # Network File System client +option PCIVERBOSE +option SCSITERSE -option CD9660 # ISO 9660 + Rock Ridge file system +option FFS +option FFS2 +option EXT2FS +option NFSCLIENT +option CD9660 option UDF -option MSDOSFS # MS-DOS file system - -option INET # IP + ICMP + TCP + UDP -option INET6 # IPv6 (needs INET) - -option BOOT_CONFIG # boot-time kernel config -option CRYPTO # Cryptographic framework +option MSDOSFS +option INET +option INET6 +option CRYPTO option RAMDISK_HOOKS option MINIROOTSIZE=4480 -config bsd root on rd0a swap on rd0b and wd0b and sd0b +config bsd root on rd0a swap on rd0b and wd0b and sd0b -mainbus0 at root -bios0 at mainbus? +mainbus0 at root +bios0 at mainbus? acpi0 at bios? #acpitimer* at acpi? @@ -50,307 +45,236 @@ acpimadt0 at acpi? mpbios0 at bios0 -cpu0 at mainbus0 -ioapic* at mainbus? -isa0 at mainbus0 -#isa0 at pcib? -pci* at mainbus0 +cpu0 at mainbus0 +ioapic* at mainbus? +isa0 at mainbus0 +#isa0 at pcib? +pci* at mainbus0 -option PCIVERBOSE - -pchb* at pci? # PCI-Host bridges -aapic* at pci? # AMD 8131 IO apic -ppb* at pci? # PCI-PCI bridges -pci* at ppb? -pci* at pchb? -#pcib* at pci? # PCI-ISA bridge +pchb* at pci? # PCI-Host bridges +aapic* at pci? # AMD 8131 IO apic +ppb* at pci? # PCI-PCI bridges +pci* at ppb? +pci* at pchb? +#pcib* at pci? # PCI-ISA bridge -# CardBus bus support cbb* at pci? cardslot* at cbb? cardbus* at cardslot? pcmcia* at cardslot? -# PCI PCMCIA controllers -#pcic* at pci? - -# PCMCIA bus support -#pcmcia* at pcic? - -# USB Controllers -#xhci* at pci? # eXtensible Host Controller -ehci* at pci? # Enhanced Host Controller -ehci* at cardbus? # Enhanced Host Controller -uhci* at pci? # Universal Host Controller (Intel) -ohci* at pci? # Open Host Controller -ohci* at cardbus? # Open Host Controller - -# USB bus support -#usb* at xhci? -usb* at ehci? -usb* at uhci? -usb* at ohci? - -uhub* at usb? # USB Hubs -uhub* at uhub? # USB Hubs -#uhid* at uhub? # USB Generic HID devices -#umodem* at uhub? # USB Modems/Serial -#ucom* at umodem? -#uvisor* at uhub? # Handspring Visor -#ucom* at uvisor? -#uftdi* at uhub? -#ucom* at uftdi? -#uaudio* at uhub? # USB Audio -#ulpt* at uhub? # USB Printers -uhidev* at uhub? -ukbd* at uhidev? -wskbd* at ukbd? mux 1 -umass* at uhub? # USB Mass Storage devices -#ums* at uhidev? -#wsmouse* at ums? mux 0 -aue* at uhub? # ADMtek AN986 Pegasus Ethernet -atu* at uhub? # Atmel AT76c50x based 802.11b -axe* at uhub? # ASIX Electronics AX88172 USB Ethernet -axen* at uhub? # ASIX Electronics AX88179 USB Ethernet -cue* at uhub? # CATC USB-EL1201A based Ethernet -kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet -smsc* at uhub? # SMSC LAN95xx Ethernet -cdce* at uhub? # CDC Ethernet -udav* at uhub? # Davicom DM9601 based Ethernet -mos* at uhub? # MOSCHIP MCS7730/7830 10/100 Ethernet -url* at uhub? # Realtek RTL8150L based adapters -wi* at uhub? # WaveLAN IEEE 802.11DS -upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' -ugl* at uhub? # Genesys Logic GL620USB-A host-to-host `network' -#urio* at uhub? # Diamond Multimedia Rio 500 -#ugen* at uhub? # USB Generic driver -ural* at uhub? # Ralink RT2500 -rum* at uhub? # Ralink RT2501USB/RT2601USB -run* at uhub? # Ralink RT2700U/RT2800U/RT3000U -zyd* at uhub? # Zydas ZD1211/ZD1211B -upgt* at uhub? # Conexant/Intersil PrismGT SoftMAC USB -urtw* at uhub? # RealTek 8187 -urtwn* at uhub? # RealTek RTL8188CU/RTL8192CU -rsu* at uhub? # RealTek RTL8188SU/RTL8191SU/RTL8192SU -uath* at uhub? # Atheros AR5005UG/AR5005UX -otus* at uhub? # Atheros AR9001U -athn* at uhub? # Atheros AR9002U - -pckbc0 at isa? # PC keyboard controller -pckbd* at pckbc? # PC keyboard -wskbd* at pckbd? mux 1 -vga0 at isa? -vga* at pci? -wsdisplay* at vga? - -com0 at isa? port 0x3f8 irq 4 # standard PC serial ports -com1 at isa? port 0x2f8 irq 3 -com2 at isa? port 0x3e8 irq 5 -#com3 at isa? port 0x2e8 irq 9 -#ast0 at isa? port 0x1a0 irq 5 # AST 4-port serial cards -#com* at ast? -#boca0 at isa? port 0x100 irq 5 # BOCA 8-port serial cards -#com* at boca? -#rtfps0 at isa? port 0x1230 irq 10 # RT 4-port serial cards -#com* at rtfps? -#com* at pcmcia? # PCMCIA modem cards - -# option for using CD1400 handshaking for incoming data -# requires a special cable that exchanges the RTS and DTR lines -# options CY_HW_RTS -#cy* at pci? # PCI cyclom card - -#lpt0 at isa? port 0x378 irq 7 # standard PC parallel ports -#lpt1 at isa? port 0x278 -#lpt2 at isa? port 0x3bc - -#bha* at pci? -ahc* at pci? # Adaptec 2940 SCSI controllers -jmb* at pci? # JMicron JMB36x controllers -ahci* at jmb? -pciide* at jmb? -ahci* at pci? # AHCI SATA controllers -sili* at pci? # Silicon Image 3124/3132/3531 SATA controllers -ahd* at pci? # Adaptec 79?? SCSI controllers -arc* at pci? # Areca RAID Controller -mpi* at pci? # LSI Logic Message Passing Interface -mpii* at pci? # LSI Message Passing Interface II -gdt* at pci? # ICP Vortex GDT RAID controllers -#aac* at pci? # Adaptec FSA RAID controllers -ami* at pci? # AMI MegaRAID controllers -mfi* at pci? # LSI MegaRAID SAS controllers -mfii* at pci? # LSI MegaRAID SAS Fusion controllers -#cac* at pci? # Compaq Smart ARRAY [234]* RAID controllers -ciss* at pci? # Compaq Smart ARRAY [56]* RAID controllers -twe* at pci? # 3ware Escalade RAID controllers -iha* at pci? # Initio Ultra/UltraWide SCSI controllers -ips* at pci? # IBM ServeRAID controllers -qlw* at pci? # QLogic ISP SCSI -qla* at pci? # QLogic ISP 2[123]xx FibreChannel -qle* at pci? # QLogic ISP 2[45]xx FibreChannel -#aic* at pcmcia? # PCMCIA based aic SCSI controllers -siop* at pci? # NCR 538XX SCSI controllers(new) -#adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI -adw* at pci? # AdvanSys ULTRA WIDE SCSI -pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI -#trm* at pci? # Tekram DC-3x5U SCSI Controllers -vmwpvs* at pci? # VMware ParaVirtual SCSI -softraid0 at root # Software RAID - -scsibus* at scsi? -sd* at scsibus? # SCSI disk drives -st* at scsibus? # SCSI tape drives -cd* at scsibus? # SCSI CD-ROM drives -#ch* at scsibus? # SCSI autochangers -#uk* at scsibus? # SCSI unknown devices - -#fdc0 at isa? port 0x3f0 irq 6 drq 2 # standard PC floppy controllers -#fdc1 at isa? port 0x370 -#fd* at fdc? - -# IDE controllers -pciide* at pci? flags 0x0000 - -wdc0 at isa? disable port 0x1f0 irq 14 flags 0x00 -wdc1 at isa? disable port 0x170 irq 15 flags 0x00 -wdc* at pcmcia? - -# IDE hard drives -wd* at wdc? flags 0x0000 -wd* at pciide? flags 0x0000 - -sdhc* at pci? # SD Host Controller -sdmmc* at sdhc? # SD/MMC bus -rtsx* at pci? # Realtek SD Card Reader -sdmmc* at rtsx? # SD/MMC bus - -# ATAPI<->SCSI -atapiscsi* at wdc? -atapiscsi* at pciide? - -de* at pci? # DC21X4X-based ethernet -fxp* at pci? # EtherExpress 10/100B ethernet -fxp* at cardbus? # Intel PRO/100 ethernet -ep* at pci? # 3C59x ethernet -ne* at pci? # NE2000-compat ethernet -ne* at pcmcia? # PCMCIA based NE2000 ethernet -ep* at pcmcia? # PCMCIA based 3C5xx ethernet -sm* at pcmcia? # PCMCIA based sm ethernet -xe* at pcmcia? # Xircom ethernet -xl* at pci? # 3C9xx ethernet -xl* at cardbus? # 3C575 ethernet -rl* at pci? # RealTek 81[23]9 ethernet -rl* at cardbus? # RealTek 81[23]9 ethernet -epic* at pci? # SMC EPIC/100 ethernet -#tl* at pci? # Compaq Thunderlan ethernet -vr* at pci? # VIA Rhine ethernet -pcn* at pci? # AMD PCnet-PCI Ethernet -dc* at pci? # 21143, "tulip" clone ethernet -dc* at cardbus? # 21143, "tulip" clone ethernet -sis* at pci? # SiS 900/7016 ethernet -se* at pci? # SiS 190/191 ethernet -#wb* at pci? # Winbond W89C840F ethernet -#ti* at pci? # Alteon Tigon 1Gb ethernet -skc* at pci? # SysKonnect GEnesis 984x -sk* at skc? # each port of above -mskc* at pci? # Marvell Yukon-2 -msk* at mskc? # each port of above -em* at pci? # Intel Pro/1000 ethernet -ixgb* at pci? # Intel Pro/10Gb ethernet -ix* at pci? # Intel 82598EB 10Gb ethernet -oce* at pci? # Emulex OneConnect 10Gb ethernet -#txp* at pci? # 3com 3CR990 -#nge* at pci? # NS DP83820/DP83821 GigE -sf* at pci? # Adaptec AIC-6915 ethernet -bge* at pci? # Broadcom BCM57xx (aka Tigon3) -bnx* at pci? # Broadcom BCM5706/5708 GigE -re* at pci? # Realtek 8169/8169S/8110S -re* at cardbus? # Realtek 8169/8169S/8110S -stge* at pci? # Sundance TC9021 GigE -#lge* at pci? # Level1 LXT1001 GigE -#mtd* at pci? # Myson MTD803 -hme* at pci? # Sun Happy Meal -vge* at pci? # VIA VT612x -nfe* at pci? # NVIDIA nForce Ethernet -xge* at pci? # Neterion Xframe-I/II 10Gb ethernet -bce* at pci? # Broadcom BCM4401 -vic* at pci? # VMware VMXnet virtual interface -vmx* at pci? # VMware VMXNET3 virtual interface -et* at pci? # Agere/LSI ET1310 -age* at pci? # Attansic L1 Ethernet -alc* at pci? # Attansic L1C/L1D/L2C Ethernet -ale* at pci? # Attansic L1E Ethernet -lii* at pci? # Attansic L2 Ethernet -jme* at pci? # JMicron JMC250/JMC260 Ethernet - -# Wireless network cards -acx* at pci? # TI ACX100/ACX111 (802.11b/g) -acx* at cardbus? # TI ACX100/ACX111 (802.11b/g) -ath* at pci? # Atheros AR5k (802.11a/b/g) -ath* at cardbus? # Atheros AR5k (802.11a/b/g) -athn* at pci? # Atheros AR9k (802.11a/g/n) -athn* at cardbus? # Atheros AR9k (802.11a/g/n) -atw* at pci? # ADMtek ADM8211 (802.11) -atw* at cardbus? # ADMtek ADM8211 (802.11) -bwi* at pci? # Broadcom AirForce (802.11b/g) -bwi* at cardbus? # Broadcom AirForce (802.11b/g) -wi* at pci? # WaveLAN IEEE 802.11DS -wi* at pcmcia? # WaveLAN IEEE 802.11DS -an* at pcmcia? # Aironet IEEE 802.11DS -#cnw* at pcmcia? # Xircom Netwave -ipw* at pci? # Intel PRO/Wireless 2100 -iwi* at pci? # Intel PRO/Wireless 2200BG/2915ABG -wpi* at pci? # Intel PRO/Wireless 3945ABG -iwn* at pci? # Intel Wireless WiFi Link 4965AGN -ral* at pci? # Ralink RT2500/RT2501/RT2600 -ral* at cardbus? # Ralink RT2500/RT2501/RT2600 -rtw* at pci? # Realtek 8180 -rtw* at cardbus? # Realtek 8180 -pgt* at pci? # Prism54 (only full-mac varients) -pgt* at cardbus? # Prism54 (only full-mac varients) -malo* at pci? # Marvell 88W8385 -malo* at cardbus? # Marvell Libertas -malo* at pcmcia? # Marvell 88W8385 - -# Media Independent Interface (mii) drivers -exphy* at mii? # 3Com internal PHYs -inphy* at mii? # Intel 82555 PHYs -iophy* at mii? # Intel 82553 PHYs -icsphy* at mii? # ICS 1890 PHYs -lxtphy* at mii? # Level1 LXT970 PHYs -nsphy* at mii? # NS and compatible PHYs -nsphyter* at mii? # NS and compatible PHYs -qsphy* at mii? # Quality Semi QS6612 PHYs -luphy* at mii? # Lucent LU6612 PHY -sqphy* at mii? # Seeq 8x220 PHYs -rlphy* at mii? # RealTek 8139 internal PHYs -mtdphy* at mii? # Myson MTD972 PHYs -dcphy* at mii? # Digital Clone PHYs -acphy* at mii? # Altima AC101 PHYs -amphy* at mii? # AMD 79C873 PHYs -tqphy* at mii? # TDK 78Q212x PHYs -brgphy* at mii? # Broadcom Gigabit PHYs -eephy* at mii? # Marvell 88E1000 series PHY -xmphy* at mii? # XaQti XMAC-II PHYs -bmtphy* at mii? # Broadcom 10/100 PHYs -rgephy* at mii? # Realtek 8169S/8110S PHY -urlphy* at mii? # Realtek RTL8150L internal PHY -ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY -etphy* at mii? # Agere/LSI ET1011 TruePHY -jmphy* at mii? # JMicron JMP202/JMP211 PHYs -ipgphy* at mii? # IC Plus IP1000A PHYs -atphy* at mii? # Attansic F1 PHYs -ukphy* at mii? # "unknown" PHYs - -pseudo-device loop 1 # network loopback -pseudo-device vlan # IEEE 802.1Q VLAN -pseudo-device bpfilter 1 # packet filter -pseudo-device rd 1 # ramdisk -pseudo-device wsmux 2 -pseudo-device bio 1 # ioctl multiplexing device - -# Virtio devices -virtio* at pci? # Virtio PCI device -vioblk* at virtio? # Virtio block device -vio* at virtio? # Virtio network device -vioscsi* at virtio? # Virtio SCSI device +#xhci* at pci? +ehci* at pci? +ehci* at cardbus? +uhci* at pci? +ohci* at pci? +ohci* at cardbus? +#usb* at xhci? +usb* at ehci? +usb* at uhci? +usb* at ohci? + +uhub* at usb? +uhub* at uhub? +uhidev* at uhub? +ukbd* at uhidev? +wskbd* at ukbd? mux 1 +umass* at uhub? +aue* at uhub? # ADMtek AN986 Pegasus Ethernet +atu* at uhub? # Atmel AT76c50x based 802.11b +axe* at uhub? # ASIX Electronics AX88172 USB Ethernet +axen* at uhub? # ASIX Electronics AX88179 USB Ethernet +cue* at uhub? # CATC USB-EL1201A based Ethernet +kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet +smsc* at uhub? # SMSC LAN95xx Ethernet +cdce* at uhub? # CDC Ethernet +udav* at uhub? # Davicom DM9601 based Ethernet +mos* at uhub? # MOSCHIP MCS7730/7830 10/100 Ethernet +url* at uhub? # Realtek RTL8150L based adapters +wi* at uhub? # WaveLAN IEEE 802.11DS +upl* at uhub? # Prolific PL2301/PL2302 host-to-host +ugl* at uhub? # Genesys Logic GL620USB-A host-to-host +ural* at uhub? # Ralink RT2500 +rum* at uhub? # Ralink RT2501USB/RT2601USB +run* at uhub? # Ralink RT2700U/RT2800U/RT3000U +zyd* at uhub? # Zydas ZD1211/ZD1211B +upgt* at uhub? # Conexant/Intersil PrismGT SoftMAC USB +urtw* at uhub? # RealTek 8187 +urtwn* at uhub? # RealTek RTL8188CU/RTL8192CU +rsu* at uhub? # RealTek RTL8188SU/RTL8191SU/RTL8192SU +uath* at uhub? # Atheros AR5005UG/AR5005UX +otus* at uhub? # Atheros AR9001U +athn* at uhub? # Atheros AR9002U + +pckbc0 at isa? # PC keyboard controller +pckbd* at pckbc? # PC keyboard +wskbd* at pckbd? mux 1 +vga0 at isa? +vga* at pci? +wsdisplay* at vga? + +com0 at isa? port 0x3f8 irq 4 # standard PC serial ports +com1 at isa? port 0x2f8 irq 3 +com2 at isa? port 0x3e8 irq 5 + +ahc* at pci? # Adaptec 2940 SCSI controllers +jmb* at pci? # JMicron JMB36x controllers +ahci* at jmb? +pciide* at jmb? +ahci* at pci? # AHCI SATA controllers +sili* at pci? # Silicon Image 3124/3132/3531 SATA controllers +ahd* at pci? # Adaptec 79?? SCSI controllers +arc* at pci? # Areca RAID Controller +mpi* at pci? # LSI Logic Message Passing Interface +mpii* at pci? # LSI Message Passing Interface II +gdt* at pci? # ICP Vortex GDT RAID controllers +ami* at pci? # AMI MegaRAID controllers +mfi* at pci? # LSI MegaRAID SAS controllers +mfii* at pci? # LSI MegaRAID SAS Fusion controllers +ciss* at pci? # Compaq Smart ARRAY [56]* RAID controllers +twe* at pci? # 3ware Escalade RAID controllers +iha* at pci? # Initio Ultra/UltraWide SCSI controllers +ips* at pci? # IBM ServeRAID controllers +qlw* at pci? # QLogic ISP SCSI +qla* at pci? # QLogic ISP 2[123]xx FibreChannel +qle* at pci? # QLogic ISP 2[45]xx FibreChannel +siop* at pci? # NCR 538XX SCSI controllers(new) +adw* at pci? # AdvanSys ULTRA WIDE SCSI +pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI +vmwpvs* at pci? # VMware ParaVirtual SCSI +softraid0 at root + +scsibus* at scsi? +sd* at scsibus? # SCSI disk drives +st* at scsibus? # SCSI tape drives +cd* at scsibus? # SCSI CD-ROM drives + +pciide* at pci? flags 0x0000 +wdc0 at isa? disable port 0x1f0 irq 14 flags 0x00 +wdc1 at isa? disable port 0x170 irq 15 flags 0x00 +wdc* at pcmcia? +wd* at wdc? flags 0x0000 +wd* at pciide? flags 0x0000 +atapiscsi* at wdc? +atapiscsi* at pciide? + +sdhc* at pci? # SD Host Controller +sdmmc* at sdhc? # SD/MMC bus +rtsx* at pci? # Realtek SD Card Reader +sdmmc* at rtsx? # SD/MMC bus + +de* at pci? # DC21X4X-based ethernet +fxp* at pci? # EtherExpress 10/100B ethernet +fxp* at cardbus? # Intel PRO/100 ethernet +ep* at pci? # 3C59x ethernet +ne* at pci? # NE2000-compat ethernet +ne* at pcmcia? # PCMCIA based NE2000 ethernet +ep* at pcmcia? # PCMCIA based 3C5xx ethernet +sm* at pcmcia? # PCMCIA based sm ethernet +xe* at pcmcia? # Xircom ethernet +xl* at pci? # 3C9xx ethernet +xl* at cardbus? # 3C575 ethernet +rl* at pci? # RealTek 81[23]9 ethernet +rl* at cardbus? # RealTek 81[23]9 ethernet +epic* at pci? # SMC EPIC/100 ethernet +vr* at pci? # VIA Rhine ethernet +pcn* at pci? # AMD PCnet-PCI Ethernet +dc* at pci? # 21143, "tulip" clone ethernet +dc* at cardbus? # 21143, "tulip" clone ethernet +sis* at pci? # SiS 900/7016 ethernet +se* at pci? # SiS 190/191 ethernet +skc* at pci? # SysKonnect GEnesis 984x +sk* at skc? # each port of above +mskc* at pci? # Marvell Yukon-2 +msk* at mskc? # each port of above +em* at pci? # Intel Pro/1000 ethernet +ixgb* at pci? # Intel Pro/10Gb ethernet +ix* at pci? # Intel 82598EB 10Gb ethernet +oce* at pci? # Emulex OneConnect 10Gb ethernet +sf* at pci? # Adaptec AIC-6915 ethernet +bge* at pci? # Broadcom BCM57xx (aka Tigon3) +bnx* at pci? # Broadcom BCM5706/5708 GigE +re* at pci? # Realtek 8169/8169S/8110S +re* at cardbus? # Realtek 8169/8169S/8110S +stge* at pci? # Sundance TC9021 GigE +hme* at pci? # Sun Happy Meal +vge* at pci? # VIA VT612x +nfe* at pci? # NVIDIA nForce Ethernet +xge* at pci? # Neterion Xframe-I/II 10Gb ethernet +bce* at pci? # Broadcom BCM4401 +vic* at pci? # VMware VMXnet virtual interface +vmx* at pci? # VMware VMXNET3 virtual interface +et* at pci? # Agere/LSI ET1310 +age* at pci? # Attansic L1 Ethernet +alc* at pci? # Attansic L1C/L1D/L2C Ethernet +ale* at pci? # Attansic L1E Ethernet +lii* at pci? # Attansic L2 Ethernet +jme* at pci? # JMicron JMC250/JMC260 Ethernet + +acx* at pci? # TI ACX100/ACX111 (802.11b/g) +acx* at cardbus? # TI ACX100/ACX111 (802.11b/g) +ath* at pci? # Atheros AR5k (802.11a/b/g) +ath* at cardbus? # Atheros AR5k (802.11a/b/g) +athn* at pci? # Atheros AR9k (802.11a/g/n) +athn* at cardbus? # Atheros AR9k (802.11a/g/n) +atw* at pci? # ADMtek ADM8211 (802.11) +atw* at cardbus? # ADMtek ADM8211 (802.11) +bwi* at pci? # Broadcom AirForce (802.11b/g) +bwi* at cardbus? # Broadcom AirForce (802.11b/g) +wi* at pci? # WaveLAN IEEE 802.11DS +wi* at pcmcia? # WaveLAN IEEE 802.11DS +an* at pcmcia? # Aironet IEEE 802.11DS +ipw* at pci? # Intel PRO/Wireless 2100 +iwi* at pci? # Intel PRO/Wireless 2200BG/2915ABG +wpi* at pci? # Intel PRO/Wireless 3945ABG +iwn* at pci? # Intel Wireless WiFi Link 4965AGN +ral* at pci? # Ralink RT2500/RT2501/RT2600 +ral* at cardbus? # Ralink RT2500/RT2501/RT2600 +rtw* at pci? # Realtek 8180 +rtw* at cardbus? # Realtek 8180 +pgt* at pci? # Prism54 (only full-mac varients) +pgt* at cardbus? # Prism54 (only full-mac varients) +malo* at pci? # Marvell 88W8385 +malo* at cardbus? # Marvell Libertas +malo* at pcmcia? # Marvell 88W8385 + +exphy* at mii? # 3Com internal PHYs +inphy* at mii? # Intel 82555 PHYs +iophy* at mii? # Intel 82553 PHYs +icsphy* at mii? # ICS 1890 PHYs +lxtphy* at mii? # Level1 LXT970 PHYs +nsphy* at mii? # NS and compatible PHYs +nsphyter* at mii? # NS and compatible PHYs +qsphy* at mii? # Quality Semi QS6612 PHYs +luphy* at mii? # Lucent LU6612 PHY +sqphy* at mii? # Seeq 8x220 PHYs +rlphy* at mii? # RealTek 8139 internal PHYs +mtdphy* at mii? # Myson MTD972 PHYs +dcphy* at mii? # Digital Clone PHYs +acphy* at mii? # Altima AC101 PHYs +amphy* at mii? # AMD 79C873 PHYs +tqphy* at mii? # TDK 78Q212x PHYs +brgphy* at mii? # Broadcom Gigabit PHYs +eephy* at mii? # Marvell 88E1000 series PHY +xmphy* at mii? # XaQti XMAC-II PHYs +bmtphy* at mii? # Broadcom 10/100 PHYs +rgephy* at mii? # Realtek 8169S/8110S PHY +urlphy* at mii? # Realtek RTL8150L internal PHY +ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY +etphy* at mii? # Agere/LSI ET1011 TruePHY +jmphy* at mii? # JMicron JMP202/JMP211 PHYs +ipgphy* at mii? # IC Plus IP1000A PHYs +atphy* at mii? # Attansic F1 PHYs +ukphy* at mii? # "unknown" PHYs + +virtio* at pci? # Virtio PCI device +vioblk* at virtio? # Virtio block device +vio* at virtio? # Virtio network device +vioscsi* at virtio? # Virtio SCSI device + +pseudo-device loop 1 +pseudo-device vlan +pseudo-device bpfilter 1 +pseudo-device rd 1 +pseudo-device wsmux 2 +pseudo-device bio 1 diff --git a/sys/arch/armish/conf/RAMDISK b/sys/arch/armish/conf/RAMDISK index 9ac60e980e3..63f26418253 100644 --- a/sys/arch/armish/conf/RAMDISK +++ b/sys/arch/armish/conf/RAMDISK @@ -1,188 +1,144 @@ -# $OpenBSD: RAMDISK,v 1.30 2014/08/22 20:03:54 deraadt Exp $ -# -# For further information on compiling OpenBSD kernels, see the config(8) -# man page. -# -# For further information on hardware support for this architecture, see -# the intro(4) man page. For further information about kernel options -# for this architecture, see the options(4) man page. For an explanation -# of each device driver in this file see the section 4 man page for the -# device. +# $OpenBSD: RAMDISK,v 1.31 2014/10/10 05:43:35 deraadt Exp $ machine armish arm -maxusers 32 # estimated number of users +maxusers 4 -options ARM32 +option TIMEZONE=0 +option DST=0 +option SMALL_KERNEL +option NO_PROPOLICE +option BOOT_CONFIG +option MINIROOTSIZE=5120 +option RAMDISK_HOOKS + +option PCIVERBOSE + +option FFS +option FFS2 +option CD9660 +option MSDOSFS +option EXT2FS +option INET +option INET6 +option CRYPTO + +config bsd root on rd0a swap on rd0b + +option ARM32 #makeoptions KERNEL_BASE_PHYS="0xa0200000" makeoptions KERNEL_BASE_PHYS="0x00200000" makeoptions KERNEL_BASE_VIRT="0xc0200000" - option CPU_XSCALE_80321 # Support the XScale core option XSCALE_CACHE_READ_WRITE_ALLOCATE #makeoptions CPUFLAGS="-mcpu=xscale" -#option PERFCTRS # performance counters - -option PCIVERBOSE - -option DST=0 # daylight saving time used by RTC -option FFS # UFS -option FFS2 # UFS2 -option CD9660 # ISO 9660 + Rock Ridge file system -option MSDOSFS # MS-DOS file system -option INET # IP + ICMP + TCP + UDP -option INET6 # IPv6 (needs INET) -option DDB # kernel debugger -option EXT2FS # Second Extended Filesystem -option CRYPTO # Cryptographic framework - -config bsd root on rd0a swap on rd0b - -# The main bus device mainbus0 at root cpu0 at mainbus? obio0 at mainbus? -# On-board 16550 UART com0 at obio? addr 0xfe800000 xint 3 -# i80321 I/O Processor peripheral support iopxs0 at mainbus? -#iopaau* at iopxs? # Application Accelerator Unit -iopiic* at iopxs? # I2C Controller Unit(s) +iopiic* at iopxs? # I2C Controller Unit(s) iic0 at iopiic? iic1 at iopiic? pcaled0 at iic? addr 0x60 # led controller -#gpio* at pcaled0 ricohrtc0 at iic? addr 0x32 # Ricoh RTC fintek0 at iic? flags 0x0001 # temp/fan controller -#iopwdog* at iopxs? # Watchdog timer pci0 at iopxs? bus ? # PCI/PCI-X support - -siop* at pci? # NCR 538XX SCSI controllers(new) +siop* at pci? # NCR 538XX SCSI controllers(new) em* at pci? re* at pci? ral* at pci? bwi* at pci? -# IDE controllers + pciide* at pci? flags 0x0000 wd* at pciide? flags 0x0000 -softraid0 at root # Software RAID +softraid0 at root scsibus* at scsi? sd* at scsibus? # SCSI disk drives -#st* at scsibus? # SCSI tape drives cd* at scsibus? # SCSI CD-ROM drives -#ch* at scsibus? # SCSI autochangers -#uk* at scsibus? # unknown SCSI - -# USB Controllers -ohci* at pci? # Open Host Controller -uhci* at pci? # Universal Host Controller -ehci* at pci? # Enhanced Host Controller -# USB bus support +ohci* at pci? +uhci* at pci? +ehci* at pci? usb* at ohci? usb* at uhci? usb* at ehci? -# USB devices -uhub* at usb? # USB Hubs -uhub* at uhub? # USB Hubs -umodem* at uhub? # USB Modems/Serial -ucom* at umodem? -uvisor* at uhub? # Handspring Visor -ucom* at uvisor? -uvscom* at uhub? # SUNTAC Slipper U VS-10U serial -ucom* at uvscom? -ubsa* at uhub? # Belkin serial adapter -ucom* at ubsa? -uftdi* at uhub? # FTDI FT8U100AX serial adapter -ucom* at uftdi? -uplcom* at uhub? # I/O DATA USB-RSAQ2 serial adapter -ucom* at uplcom? -umct* at uhub? # MCT USB-RS232 serial adapter -ucom* at umct? -uipaq* at uhub? # iPAQ serial adapter -ucom* at uipaq? -umsm* at uhub? # Qualcomm MSM EVDO -ucom* at umsm? -#uaudio* at uhub? # USB Audio -#audio* at uaudio? -#umidi* at uhub? # USB MIDI -#midi* at umidi? -#ulpt* at uhub? # USB Printers -umass* at uhub? # USB Mass Storage devices -uhidev* at uhub? # Human Interface Devices -ums* at uhidev? # USB mouse -wsmouse* at ums? mux 0 -ukbd* at uhidev? # USB keyboard -wskbd* at ukbd? mux 1 -uhid* at uhidev? # USB generic HID support -aue* at uhub? # ADMtek AN986 Pegasus Ethernet -atu* at uhub? # Atmel AT76c50x based 802.11b -axe* at uhub? # ASIX Electronics AX88172 USB Ethernet -axen* at uhub? # ASIX Electronics AX88179 USB Ethernet -cue* at uhub? # CATC USB-EL1201A based Ethernet -kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet -smsc* at uhub? # SMSC LAN95xx Ethernet -cdce* at uhub? # CDC Ethernet -upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' -ugl* at uhub? # Genesys Logic GL620USB-A host-to-host `network' -udav* at uhub? # Davicom DM9601 based Ethernet -url* at uhub? # Realtek RTL8150L based adapters -wi* at uhub? # WaveLAN IEEE 802.11DS -#urio* at uhub? # Diamond Multimedia Rio 500 -#udsbr* at uhub? # D-Link DSB-R100 radio -#radio* at udsbr? # USB radio -#ubt* at uhub? disable # USB Bluetooth -ugen* at uhub? # USB Generic driver -ural* at uhub? # Ralink RT2500 -#udcf* at uhub? # Gude Expert mouseCLOCK - -amphy* at mii? # AMD 79C873 PHYs -dcphy* at mii? # Digital Clone PHYs -exphy* at mii? # 3Com internal PHYs -inphy* at mii? # Intel 82555 PHYs -iophy* at mii? # Intel 82553 PHYs -icsphy* at mii? # ICS1890 PHYs -lxtphy* at mii? # Level One LXT-970 PHYs -nsphy* at mii? # NS83840 PHYs -#nsphyter* at mii? # NS83843 PHYs -mtdphy* at mii? # Myson MTD972 PHYs -acphy* at mii? # Altima AC101 PHYs -qsphy* at mii? # Quality Semi QS6612 PHYs -luphy* at mii? # Lucent LU6612 PHY -sqphy* at mii? # Seeq 8022[013] PHYs -rlphy* at mii? # RealTek 8139 internal PHYs -#tlphy* at mii? # ThunderLAN PHYs -tqphy* at mii? # TDK Semiconductor PHYs -brgphy* at mii? # Broadcom 10/100/1000 PHYs -bmtphy* at mii? # Broadcom 10/100 PHYs -eephy* at mii? # Marvell 88E1000 Gigabit PHYs -urlphy* at mii? # Realtek RTL8150L internal PHY -rgephy* at mii? # Realtek 8169S/8110S PHY -rlphy* at mii? # Realtek 8139 internal PHYs -ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY -ukphy* at mii? # generic unknown PHYs - -# mouse & keyboard multiplexor pseudo-devices -pseudo-device wsmux 2 -pseudo-device bio 1 # ioctl multiplexing device -pseudo-device hotplug 1 # devices hot plugging - -# -pseudo-device loop 1 # network loopback -pseudo-device bpfilter 1 # packet filter -pseudo-device rd 1 # ram disk - -option BOOT_CONFIG # boot-time kernel config - -# RAMDISK stuff -option MINIROOTSIZE=5120 -option RAMDISK_HOOKS +uhub* at usb? +uhub* at uhub? +umodem* at uhub? # USB Modems/Serial +ucom* at umodem? +uvisor* at uhub? # Handspring Visor +ucom* at uvisor? +uvscom* at uhub? # SUNTAC Slipper U VS-10U serial +ucom* at uvscom? +ubsa* at uhub? # Belkin serial adapter +ucom* at ubsa? +uftdi* at uhub? # FTDI FT8U100AX serial adapter +ucom* at uftdi? +uplcom* at uhub? # I/O DATA USB-RSAQ2 serial adapter +ucom* at uplcom? +umct* at uhub? # MCT USB-RS232 serial adapter +ucom* at umct? +uipaq* at uhub? # iPAQ serial adapter +ucom* at uipaq? +umsm* at uhub? # Qualcomm MSM EVDO +ucom* at umsm? +umass* at uhub? +uhidev* at uhub? # Human Interface Devices +ukbd* at uhidev? # USB keyboard +wskbd* at ukbd? mux 1 +uhid* at uhidev? # USB generic HID support +aue* at uhub? # ADMtek AN986 Pegasus Ethernet +atu* at uhub? # Atmel AT76c50x based 802.11b +axe* at uhub? # ASIX Electronics AX88172 USB Ethernet +axen* at uhub? # ASIX Electronics AX88179 USB Ethernet +cue* at uhub? # CATC USB-EL1201A based Ethernet +kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet +smsc* at uhub? # SMSC LAN95xx Ethernet +cdce* at uhub? # CDC Ethernet +upl* at uhub? # Prolific PL2301/PL2302 host-to-host +ugl* at uhub? # Genesys Logic GL620USB-A host-to-host +udav* at uhub? # Davicom DM9601 based Ethernet +url* at uhub? # Realtek RTL8150L based adapters +wi* at uhub? # WaveLAN IEEE 802.11DS +ugen* at uhub? # USB Generic driver +ural* at uhub? # Ralink RT2500 + +amphy* at mii? # AMD 79C873 PHYs +dcphy* at mii? # Digital Clone PHYs +exphy* at mii? # 3Com internal PHYs +inphy* at mii? # Intel 82555 PHYs +iophy* at mii? # Intel 82553 PHYs +icsphy* at mii? # ICS1890 PHYs +lxtphy* at mii? # Level One LXT-970 PHYs +nsphy* at mii? # NS83840 PHYs +mtdphy* at mii? # Myson MTD972 PHYs +acphy* at mii? # Altima AC101 PHYs +qsphy* at mii? # Quality Semi QS6612 PHYs +luphy* at mii? # Lucent LU6612 PHY +sqphy* at mii? # Seeq 8022[013] PHYs +rlphy* at mii? # RealTek 8139 internal PHYs +tqphy* at mii? # TDK Semiconductor PHYs +brgphy* at mii? # Broadcom 10/100/1000 PHYs +bmtphy* at mii? # Broadcom 10/100 PHYs +eephy* at mii? # Marvell 88E1000 Gigabit PHYs +urlphy* at mii? # Realtek RTL8150L internal PHY +rgephy* at mii? # Realtek 8169S/8110S PHY +rlphy* at mii? # Realtek 8139 internal PHYs +ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY +ukphy* at mii? # generic unknown PHYs + +pseudo-device wsmux 2 +pseudo-device bio 1 +pseudo-device loop 1 +pseudo-device bpfilter 1 +pseudo-device rd 1 diff --git a/sys/arch/armv7/conf/RAMDISK-IMX b/sys/arch/armv7/conf/RAMDISK-IMX index e297d4b2f6b..6a4e0f8b196 100644 --- a/sys/arch/armv7/conf/RAMDISK-IMX +++ b/sys/arch/armv7/conf/RAMDISK-IMX @@ -1,96 +1,62 @@ -# $OpenBSD: RAMDISK-IMX,v 1.11 2014/08/22 20:03:56 deraadt Exp $ -# -# GENERIC machine description file -# -# This machine description file is used to generate the default OpenBSD -# kernel. The generic kernel does not include all options, subsystems -# and device drivers, but should be useful for most applications. -# -# The machine description file can be customised for your specific -# machine to reduce the kernel size and improve its performance. -# -# For further information on compiling OpenBSD kernels, see the config(8) -# man page. -# -# For further information on hardware support for this architecture, see -# the intro(4) man page. For further information about kernel options -# for this architecture, see the options(4) man page. For an explanation -# of each device driver in this file see the section 4 man page for the -# device. - -machine armv7 arm - -options TIMEZONE=0 # time zone to adjust RTC time by -options DST=0 # daylight saving time used by RTC -options FFS # UFS -#options CD9660 # ISO 9660 + Rock Ridge file system -options MSDOSFS # MS-DOS file system -options INET # IP + ICMP + TCP + UDP -options INET6 # IPv6 (needs INET) -options DDB # kernel debugger -options DIAGNOSTIC -options FIFO # FIFOs; RECOMMENDED -option EXT2FS # Second Extended Filesystem -#option NFSCLIENT # NFS +# $OpenBSD: RAMDISK-IMX,v 1.12 2014/10/10 05:43:35 deraadt Exp $ -makeoptions KERNEL_BASE_PHYS="0x10800000" -makeoptions KERNEL_BASE_VIRT="0xc0800000" -options BUILD_STARTUP_PAGETABLE -options STARTUP_PAGETABLE_ADDR=0x10200000 -options SDRAM_START="0x10000000" +machine armv7 arm +maxusers 4 -# estimated number of users +option TIMEZONE=0 +option DST=0 +option SMALL_KERNEL +option NO_PROPOLICE +option BOOT_CONFIG -maxusers 32 +option MINIROOTSIZE=10240 +option RAMDISK_HOOKS -# CPU options -options CPU_ARMv7 # Support the ARMv7 +option USBVERBOSE -#option WSDISPLAY_COMPAT_USL # VT handling -#option WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes -option WSDISPLAY_DEFAULTSCREENS=1 -#option WSDISPLAY_COMPAT_PCVT # emulate some ioctls +option FFS +option MSDOSFS +option INET +option INET6 +option EXT2FS -option USBVERBOSE +makeoptions KERNEL_BASE_PHYS="0x10800000" +makeoptions KERNEL_BASE_VIRT="0xc0800000" +option BUILD_STARTUP_PAGETABLE +option STARTUP_PAGETABLE_ADDR=0x10200000 +option SDRAM_START="0x10000000" +option CPU_ARMv7 # Support the ARMv7 -config bsd root on rd0a swap on rd0b +config bsd root on rd0a swap on rd0b -# The main bus device mainbus0 at root cpu0 at mainbus? -# Cortex-A9 (iMX6) -cortex0 at mainbus? +cortex0 at mainbus? # Cortex-A9 (iMX6) ampintc* at cortex? amptimer* at cortex? armliicc* at cortex? -# iMX SoC -imx0 at mainbus? - -# iMX on-chip devices -imxccm* at imx? # clock control module -imxiomuxc* at imx? # iomux controller -imxdog* at imx? # watchdog timer -imxocotp* at imx? # on-chip otp controller -imxgpio* at imx? # user-visible GPIO pins? -imxesdhc* at imx? # SDHC controller -imxenet* at imx? # ethernet -imxuart* at imx? # onboard uarts -imxiic* at imx? # i2c - -ahci* at imx? # AHCI/SATA - -ehci* at imx? # EHCI (shim) +imx0 at mainbus? # iMX SoC +imxccm* at imx? # clock control module +imxiomuxc* at imx? # iomux controller +imxdog* at imx? # watchdog timer +imxocotp* at imx? # on-chip otp controller +imxgpio* at imx? # user-visible GPIO pins? +imxesdhc* at imx? # SDHC controller +imxenet* at imx? # ethernet +imxuart* at imx? # onboard uarts +imxiic* at imx? # i2c +ahci* at imx? # AHCI/SATA +ehci* at imx? usb* at ehci? -# USB bus support usb* at ehci? flags 0x1 uhub* at usb? uhub* at uhub? -uhub* at usb? # USB Hubs -uhub* at uhub? # USB Hubs +uhub* at usb? +uhub* at uhub? umodem* at uhub? # USB Modems/Serial ucom* at umodem? uvisor* at uhub? # Handspring Visor @@ -101,19 +67,17 @@ ubsa* at uhub? # Belkin serial adapter ucom* at ubsa? uftdi* at uhub? # FTDI FT8U100AX serial adapter ucom* at uftdi? -uplcom* at uhub? # I/O DATA USB-RSAQ2 serial adapter +uplcom* at uhub? # I/O DATA USB-RSAQ2 serial adapter ucom* at uplcom? umct* at uhub? # MCT USB-RS232 serial adapter ucom* at umct? -uaudio* at uhub? # USB Audio +uaudio* at uhub? # USB Audio audio* at uaudio? umidi* at uhub? # USB MIDI midi* at umidi? ulpt* at uhub? # USB Printers -umass* at uhub? # USB Mass Storage devices +umass* at uhub? uhidev* at uhub? # Human Interface Devices -ums* at uhidev? # USB mouse -wsmouse* at ums? mux 0 ukbd* at uhidev? # USB keyboard wskbd* at ukbd? mux 1 uhid* at uhidev? # USB generic HID support @@ -125,15 +89,14 @@ cue* at uhub? # CATC USB-EL1201A based Ethernet kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet smsc* at uhub? # SMSC LAN95xx Ethernet cdce* at uhub? # CDC Ethernet -upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' -ugl* at uhub? # Genesys Logic GL620USB-A host-to-host `network' +upl* at uhub? # Prolific PL2301/PL2302 host-to-host +ugl* at uhub? # Genesys Logic GL620USB-A host-to-host udav* at uhub? # Davicom DM9601 based Ethernet url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS urio* at uhub? # Diamond Multimedia Rio 500 udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio -#ubt* at uhub? disable # USB Bluetooth ugen* at uhub? # USB Generic driver rum* at uhub? # Ralink RT2501USB/RT2601USB @@ -142,22 +105,12 @@ ukphy* at mii? # "unknown" PHYs scsibus* at scsi? sd* at scsibus? -st* at scsibus? cd* at scsibus? -ch* at scsibus? -uk* at scsibus? sdmmc* at imxesdhc? # SD/MMC bus -# I2C bus support iic* at imxiic? -# Pseudo-Devices -#pseudo-device wsmux 2 # mouse & keyboard multiplexor -pseudo-device loop 1 # network loopback -pseudo-device bpfilter 1 # packet filter -pseudo-device rd 1 # ram disk - -# RAMDISK stuff -options MINIROOTSIZE=10240 -options RAMDISK_HOOKS +pseudo-device loop 1 +pseudo-device bpfilter 1 +pseudo-device rd 1 diff --git a/sys/arch/armv7/conf/RAMDISK-OMAP b/sys/arch/armv7/conf/RAMDISK-OMAP index c2d08b2044b..fec8f2943d7 100644 --- a/sys/arch/armv7/conf/RAMDISK-OMAP +++ b/sys/arch/armv7/conf/RAMDISK-OMAP @@ -1,188 +1,97 @@ -# $OpenBSD: RAMDISK-OMAP,v 1.9 2014/08/22 20:03:56 deraadt Exp $ -# -# GENERIC machine description file -# -# This machine description file is used to generate the default OpenBSD -# kernel. The generic kernel does not include all options, subsystems -# and device drivers, but should be useful for most applications. -# -# The machine description file can be customised for your specific -# machine to reduce the kernel size and improve its performance. -# -# For further information on compiling OpenBSD kernels, see the config(8) -# man page. -# -# For further information on hardware support for this architecture, see -# the intro(4) man page. For further information about kernel options -# for this architecture, see the options(4) man page. For an explanation -# of each device driver in this file see the section 4 man page for the -# device. - -machine armv7 arm - -options TIMEZONE=0 # time zone to adjust RTC time by -options DST=0 # daylight saving time used by RTC -options FFS # UFS -#options CD9660 # ISO 9660 + Rock Ridge file system -options MSDOSFS # MS-DOS file system -options INET # IP + ICMP + TCP + UDP -options INET6 # IPv6 (needs INET) -options DDB # kernel debugger -options DIAGNOSTIC -options FIFO # FIFOs; RECOMMENDED -#options NFSCLIENT # NFS +# $OpenBSD: RAMDISK-OMAP,v 1.10 2014/10/10 05:43:35 deraadt Exp $ -makeoptions KERNEL_BASE_PHYS="0x80300000" -makeoptions KERNEL_BASE_VIRT="0xc0300000" -options BUILD_STARTUP_PAGETABLE -options STARTUP_PAGETABLE_ADDR=0x80200000 -options SDRAM_START="0x80000000" +machine armv7 arm +maxusers 4 -# estimated number of users +option TIMEZONE=0 +option DST=0 +option SMALL_KERNEL +option NO_PROPOLICE +option BOOT_CONFIG -maxusers 32 +option MINIROOTSIZE=10240 +option RAMDISK_HOOKS -# CPU options -options CPU_ARMv7 # Support the ARMv7 +option USBVERBOSE -#option WSDISPLAY_COMPAT_USL # VT handling -#option WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes -option WSDISPLAY_DEFAULTSCREENS=1 -#option WSDISPLAY_COMPAT_PCVT # emulate some ioctls +option FFS +option MSDOSFS +option INET +option INET6 -option USBVERBOSE +makeoptions KERNEL_BASE_PHYS="0x80300000" +makeoptions KERNEL_BASE_VIRT="0xc0300000" +option BUILD_STARTUP_PAGETABLE +option STARTUP_PAGETABLE_ADDR=0x80200000 +option SDRAM_START="0x80000000" +option CPU_ARMv7 # Support the ARMv7 -config bsd root on rd0a swap on rd0b +config bsd root on rd0a swap on rd0b -# The main bus device mainbus0 at root cpu0 at mainbus? -# OMAP3xxx/OMAP4xxx SoC -omap0 at mainbus? +omap0 at mainbus? # OMAP3xxx/OMAP4xxx SoC omapid* at omap? -# Cortex-A9 (OMAP4) -cortex0 at mainbus? +cortex0 at mainbus? # Cortex-A9 (OMAP4) ampintc* at cortex? amptimer* at cortex? -#armliicc* at cortex? # L2 cache controller - -# OMAP3 only -intc* at omap? # interrupt controller - -# OMAP on-chip devices -prcm* at omap? # power/clock controller -sitaracm* at omap? # sitara control module -omdog* at omap? # watchdog timer -omgpio* at omap? # user-visible GPIO pins? -gptimer* at omap? # general purpose timers -dmtimer* at omap? # am335x dual mode timers -ommmc* at omap? # SD/MMC card controller +#armliicc* at cortex? # L2 cache controller + +intc* at omap? # OMAP3 interrupt controller + +prcm* at omap? # power/clock controller +sitaracm* at omap? # sitara control module +omdog* at omap? # watchdog timer +omgpio* at omap? # user-visible GPIO pins? +gptimer* at omap? # general purpose timers +dmtimer* at omap? # am335x dual mode timers +ommmc* at omap? # SD/MMC card controller +sdmmc* at ommmc? omusbtll* at omap? cpsw* at omap? #omkbd0 at omap? #wskbd* at omkbd? mux 1 -ehci* at omap? # EHCI (shim) +ehci* at omap? usb* at ehci? #mcspi0 at omap? addr 0x48098000 intr 65 #mcspi1 at omap? addr 0x4809A000 intr 66 #atlas0 at omap? intr 85 # really a spi device, not omap -#wskbd* at atlas? mux 1 +#wskbd* at atlas? mux 1 #usbotg0 at omap? #usb* at ohci? -## USB bus support usb* at ehci? flags 0x1 uhub* at usb? -uhub* at uhub? -uhub* at usb? # USB Hubs -# uhub* at uhub? # USB Hubs -# umodem* at uhub? # USB Modems/Serial -# ucom* at umodem? -# uvisor* at uhub? # Handspring Visor -# ucom* at uvisor? -# uvscom* at uhub? # SUNTAC Slipper U VS-10U serial -# ucom* at uvscom? -# ubsa* at uhub? # Belkin serial adapter -# ucom* at ubsa? -# uftdi* at uhub? # FTDI FT8U100AX serial adapter -# ucom* at uftdi? -# uplcom* at uhub? # I/O DATA USB-RSAQ2 serial adapter -# ucom* at uplcom? -# umct* at uhub? # MCT USB-RS232 serial adapter -# ucom* at umct? -# uaudio* at uhub? # USB Audio -# audio* at uaudio? -# umidi* at uhub? # USB MIDI -# midi* at umidi? -# ulpt* at uhub? # USB Printers -umass* at uhub? # USB Mass Storage devices +uhub* at uhub? +uhub* at usb? +umass* at uhub? scsibus* at umass? uhidev* at uhub? # Human Interface Devices -ums* at uhidev? # USB mouse -wsmouse* at ums? mux 0 ukbd* at uhidev? # USB keyboard wskbd* at ukbd? mux 1 uhid* at uhidev? # USB generic HID support -# aue* at uhub? # ADMtek AN986 Pegasus Ethernet -# atu* at uhub? # Atmel AT76c50x based 802.11b -# axe* at uhub? # ASIX Electronics AX88172 USB Ethernet -# axen* at uhub? # ASIX Electronics AX88179 USB Ethernet -# cue* at uhub? # CATC USB-EL1201A based Ethernet -# kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet smsc* at uhub? # SMSC LAN95xx Ethernet -# cdce* at uhub? # CDC Ethernet -# upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' -# ugl* at uhub? # Genesys Logic GL620USB-A host-to-host `network' -# udav* at uhub? # Davicom DM9601 based Ethernet -# url* at uhub? # Realtek RTL8150L based adapters -# wi* at uhub? # WaveLAN IEEE 802.11DS -# urio* at uhub? # Diamond Multimedia Rio 500 -# udsbr* at uhub? # D-Link DSB-R100 radio -# radio* at udsbr? # USB radio -# #ubt* at uhub? disable # USB Bluetooth -ugen* at uhub? # USB Generic driver rum* at uhub? # Ralink RT2501USB/RT2601USB -# -ukphy* at mii? # "unknown" PHYs + +ukphy* at mii? # "unknown" PHYs scsibus* at scsi? sd* at scsibus? -st* at scsibus? cd* at scsibus? -ch* at scsibus? -uk* at scsibus? - -# onboard uarts com* at omap? -# LCD #omdisplay0 at omap? #wsdisplay* at omdisplay? console ? -sdmmc* at ommmc? # SD/MMC bus - -# Bluetooth controllers -#sbt* at sdmmc? disable # SDIO Bluetooth - -# APM emulation -#apm0 at pxaip? - -# Pseudo-Devices -#pseudo-device wsmux 2 # mouse & keyboard multiplexor -pseudo-device loop 1 # network loopback -pseudo-device bpfilter 1 # packet filter -pseudo-device rd 1 # ram disk -pseudo-device hotplug 1 # devices hot plugging - -# RAMDISK stuff -options MINIROOTSIZE=10240 -options RAMDISK_HOOKS +pseudo-device loop 1 +pseudo-device bpfilter 1 +pseudo-device rd 1 diff --git a/sys/arch/armv7/conf/RAMDISK-SUNXI b/sys/arch/armv7/conf/RAMDISK-SUNXI index 69feda1a0a4..6f3f738411f 100644 --- a/sys/arch/armv7/conf/RAMDISK-SUNXI +++ b/sys/arch/armv7/conf/RAMDISK-SUNXI @@ -1,75 +1,43 @@ -# $OpenBSD: RAMDISK-SUNXI,v 1.9 2014/08/22 20:03:56 deraadt Exp $ -# -# GENERIC machine description file -# -# This machine description file is used to generate the default OpenBSD -# kernel. The generic kernel does not include all options, subsystems -# and device drivers, but should be useful for most applications. -# -# The machine description file can be customised for your specific -# machine to reduce the kernel size and improve its performance. -# -# For further information on compiling OpenBSD kernels, see the config(8) -# man page. -# -# For further information on hardware support for this architecture, see -# the intro(4) man page. For further information about kernel options -# for this architecture, see the options(4) man page. For an explanation -# of each device driver in this file see the section 4 man page for the -# device. - -machine armv7 arm - -options TIMEZONE=0 # time zone to adjust RTC time by -options DST=0 # daylight saving time used by RTC -options FFS # UFS -#options CD9660 # ISO 9660 + Rock Ridge file system -options MSDOSFS # MS-DOS file system -options INET # IP + ICMP + TCP + UDP -options INET6 # IPv6 (needs INET) -options DDB # kernel debugger -options DIAGNOSTIC -options FIFO # FIFOs; RECOMMENDED -#options NFSCLIENT # NFS +# $OpenBSD: RAMDISK-SUNXI,v 1.10 2014/10/10 05:43:35 deraadt Exp $ -makeoptions KERNEL_BASE_PHYS="0x40800000" -makeoptions KERNEL_BASE_VIRT="0xc0800000" -options BUILD_STARTUP_PAGETABLE -options STARTUP_PAGETABLE_ADDR=0x40200000 -options SDRAM_START="0x40000000" +machine armv7 arm +maxusers 4 -# estimated number of users +option TIMEZONE=0 +option DST=0 +option SMALL_KERNEL +option NO_PROPOLICE +option BOOT_CONFIG -maxusers 32 +option MINIROOTSIZE=10240 +option RAMDISK_HOOKS -# CPU options -options CPU_ARMv7 # Support the ARMv7 +option USBVERBOSE -#option WSDISPLAY_COMPAT_USL # VT handling -#option WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes -option WSDISPLAY_DEFAULTSCREENS=1 -#option WSDISPLAY_COMPAT_PCVT # emulate some ioctls +option FFS +option MSDOSFS +option INET +option INET6 -option USBVERBOSE +makeoptions KERNEL_BASE_PHYS="0x40800000" +makeoptions KERNEL_BASE_VIRT="0xc0800000" +option BUILD_STARTUP_PAGETABLE +option STARTUP_PAGETABLE_ADDR=0x40200000 +option SDRAM_START="0x40000000" +option CPU_ARMv7 # Support the ARMv7 -config bsd root on rd0a swap on rd0b +config bsd root on rd0a swap on rd0b -# The main bus device mainbus0 at root cpu0 at mainbus? -# Sunxi A1x/A20 SoC -sunxi0 at mainbus? +sunxi0 at mainbus? +a1xintc* at sunxi? # A1x interrupt controller -# A1x only -a1xintc* at sunxi? # interrupt controller - -# A20 only -cortex0 at mainbus? +cortex0 at mainbus? # A20 ampintc* at cortex? #agtimer* at cortex? -# Sunxi on-chip devices sxipio* at sunxi? # GPIO pins for leds & PHYs sxiccmu* at sunxi? # Clock Control Module/Unit sxitimer* at sunxi? @@ -78,81 +46,30 @@ sxirtc* at sunxi? # Real Time Clock sxiuart* at sunxi? # onboard uarts sxie* at sunxi? ahci* at sunxi? # AHCI/SATA (shim) -ehci* at sunxi? # EHCI (shim) -#ohci* at sunxi? # OHCI (shim) +ehci* at sunxi? +#ohci* at sunxi? #usbotg0 at sunxi? -# USB bus support usb* at ehci? #flags 0x1 #usb* at ohci? -uhub* at usb? # USB Hubs -uhub* at uhub? # USB Hubs -# umodem* at uhub? # USB Modems/Serial -# ucom* at umodem? -# uvisor* at uhub? # Handspring Visor -# ucom* at uvisor? -# uvscom* at uhub? # SUNTAC Slipper U VS-10U serial -# ucom* at uvscom? -# ubsa* at uhub? # Belkin serial adapter -# ucom* at ubsa? -# uftdi* at uhub? # FTDI FT8U100AX serial adapter -# ucom* at uftdi? -# uplcom* at uhub? # I/O DATA USB-RSAQ2 serial adapter -# ucom* at uplcom? -# umct* at uhub? # MCT USB-RS232 serial adapter -# ucom* at umct? -# uaudio* at uhub? # USB Audio -# audio* at uaudio? -# umidi* at uhub? # USB MIDI -# midi* at umidi? -# ulpt* at uhub? # USB Printers -umass* at uhub? # USB Mass Storage devices +uhub* at usb? +uhub* at uhub? +umass* at uhub? scsibus* at umass? uhidev* at uhub? # Human Interface Devices -ums* at uhidev? # USB mouse -wsmouse* at ums? mux 0 ukbd* at uhidev? # USB keyboard wskbd* at ukbd? mux 1 uhid* at uhidev? # USB generic HID support -# aue* at uhub? # ADMtek AN986 Pegasus Ethernet -# atu* at uhub? # Atmel AT76c50x based 802.11b -# axe* at uhub? # ASIX Electronics AX88172 USB Ethernet -# axen* at uhub? # ASIX Electronics AX88179 USB Ethernet -# cue* at uhub? # CATC USB-EL1201A based Ethernet -# kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet -# smsc* at uhub? # SMSC LAN95xx Ethernet -# cdce* at uhub? # CDC Ethernet -# upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' -# ugl* at uhub? # Genesys Logic GL620USB-A host-to-host `network' -# udav* at uhub? # Davicom DM9601 based Ethernet -# url* at uhub? # Realtek RTL8150L based adapters -# wi* at uhub? # WaveLAN IEEE 802.11DS -# urio* at uhub? # Diamond Multimedia Rio 500 -# udsbr* at uhub? # D-Link DSB-R100 radio -# radio* at udsbr? # USB radio -# #ubt* at uhub? disable # USB Bluetooth -ugen* at uhub? # USB Generic driver rum* at uhub? # Ralink RT2501USB/RT2601USB -# XXX missing usable drivers, like run(4). ukphy* at mii? # "unknown" PHYs rlphy* at mii? # RealTek 8139 internal PHYs scsibus* at scsi? sd* at scsibus? -st* at scsibus? cd* at scsibus? -ch* at scsibus? -uk* at scsibus? - -# Pseudo-Devices -#pseudo-device wsmux 2 # mouse & keyboard multiplexor -pseudo-device loop 1 # network loopback -pseudo-device bpfilter 1 # packet filter -pseudo-device rd 1 # ram disk -pseudo-device hotplug 1 # devices hot plugging - -# RAMDISK stuff -options MINIROOTSIZE=10240 -options RAMDISK_HOOKS + +pseudo-device loop 1 +pseudo-device bpfilter 1 +pseudo-device rd 1 diff --git a/sys/arch/aviion/conf/RAMDISK b/sys/arch/aviion/conf/RAMDISK index d5329b73883..1ebaa6f6832 100644 --- a/sys/arch/aviion/conf/RAMDISK +++ b/sys/arch/aviion/conf/RAMDISK @@ -1,94 +1,59 @@ -# $OpenBSD: RAMDISK,v 1.1 2013/10/15 13:28:09 miod Exp $ +# $OpenBSD: RAMDISK,v 1.2 2014/10/10 05:43:35 deraadt Exp $ machine aviion m88k +maxusers 4 + +option TIMEZONE=0 +option DST=0 +option SMALL_KERNEL +option NO_PROPOLICE +option BOOT_CONFIG option MINIROOTSIZE=4096 option RAMDISK_HOOKS -option FFS # UFS -#option FFS2 # UFS2 -option NFSCLIENT # Network File System client -option CD9660 # ISO 9660 + Rock Ridge file system - -option INET # IP + ICMP + TCP + UDP -option INET6 # IPv6 (needs INET) - -option BOOT_CONFIG # add support for boot -c -maxusers 32 # estimated number of users +option FFS +option NFSCLIENT +option CD9660 +option INET +option INET6 -# Processor type option M88100 #option M88110 - -# Supported models option AV400 # 100, 200, 300, 400, 3000, 4000, 4300 option AV530 # 4600, 530 #option AV5000 # 5000, 6000 #option AV6280 # 6280, 8000-8 - -# Define this if your 88100 processor has the xxx.usr bug (mask C82N) -option ERRATA__XXX_USR - -config bsd root on rd0a swap on rd0b - -# -# devices -# - -mainbus0 at root - -# -# Onboard devices for all 88100-based machines -# - -syscon0 at mainbus0 addr 0xfff00000 -nvram0 at syscon? offset 0x80000 -dart0 at syscon? offset 0x82000 # serial ports -#avkbc0 at syscon? offset 0x82800 -#pckbd* at avkbc? -#wskbd* at avkbd? -vme0 at syscon? offset 0x85000 # VME bridge -#avfb0 at syscon? offset 0x89000 -#wsdisplay* at avfb? - -# -# AV400 onboard devices -# - -dart1 at syscon? offset 0x82c00 -oaic0 at syscon? offset 0x8a000 -le0 at syscon? offset 0x8c000 # on-board ethernet - -# -# AV530 onboard devices -# - -dart1 at syscon? offset 0x82040 -oosiop0 at syscon? offset 0xb0000 -oosiop1 at syscon? offset 0xb0080 -le0 at syscon? offset 0xb0100 -le1 at syscon? offset 0xb0140 - -# -# VME devices -# - -# Interphase Hawk Ethernet -le* at vme? a32 0x00900000 a16 0x4000 ipl 3 # artwork X0A factory settings -le* at vme? a32 0x55540000 a16 0x8600 ipl 3 # artwork X0B factory settings -le* at vme? a32 0x55900000 a16 0x4000 ipl 3 -le* at vme? a32 0x55980000 a16 0x5000 ipl 3 - -# -# SCSI devices -# - -scsibus* at scsi? -sd* at scsibus? -st* at scsibus? -cd* at scsibus? - -pseudo-device bpfilter # packet filter -pseudo-device loop # network loopback -pseudo-device rd 1 - +option ERRATA__XXX_USR # processor xxx.usr bug (mask C82N) + +config bsd root on rd0a swap on rd0b + +mainbus0 at root +syscon0 at mainbus0 addr 0xfff00000 +nvram0 at syscon? offset 0x80000 +dart0 at syscon? offset 0x82000 # serial ports +vme0 at syscon? offset 0x85000 # VME bridge + +dart1 at syscon? offset 0x82c00 +oaic0 at syscon? offset 0x8a000 +le0 at syscon? offset 0x8c000 # on-board ethernet + +dart1 at syscon? offset 0x82040 +oosiop0 at syscon? offset 0xb0000 +oosiop1 at syscon? offset 0xb0080 +le0 at syscon? offset 0xb0100 +le1 at syscon? offset 0xb0140 + +le* at vme? a32 0x00900000 a16 0x4000 ipl 3 # artwork X0A factory settings +le* at vme? a32 0x55540000 a16 0x8600 ipl 3 # artwork X0B factory settings +le* at vme? a32 0x55900000 a16 0x4000 ipl 3 +le* at vme? a32 0x55980000 a16 0x5000 ipl 3 + +scsibus* at scsi? +sd* at scsibus? +st* at scsibus? +cd* at scsibus? + +pseudo-device bpfilter 1 +pseudo-device loop 1 +pseudo-device rd 1 diff --git a/sys/arch/hppa/conf/RAMDISK b/sys/arch/hppa/conf/RAMDISK index 169df8f873e..a303d980e3e 100644 --- a/sys/arch/hppa/conf/RAMDISK +++ b/sys/arch/hppa/conf/RAMDISK @@ -1,26 +1,27 @@ -# $OpenBSD: RAMDISK,v 1.104 2014/10/01 18:15:36 deraadt Exp $ -# -# Diskless kernel config -# +# $OpenBSD: RAMDISK,v 1.105 2014/10/10 05:43:35 deraadt Exp $ -# Machine architecture; required by config(8) machine hppa +maxusers 4 +option TIMEZONE=0 +option DST=0 option SMALL_KERNEL option NO_PROPOLICE +option BOOT_CONFIG -option SCSITERSE +option RAMDISK_HOOKS +option MINIROOTSIZE=5120 -option DDB # in-kernel debugger +option SCSITERSE +option PCIVERBOSE -option FFS # UFS -option FFS2 # UFS2 -option NFSCLIENT # Network File System client -option CD9660 # ISO 9660 + Rock Ridge file system -#option UDF # UDF (DVD) file system -option MSDOSFS # MS-DOS file system -option INET # IP + ICMP + TCP + UDP -option INET6 # IPv6 (needs INET) +option FFS +option FFS2 +option NFSCLIENT +option CD9660 +option MSDOSFS +option INET +option INET6 # Support for various CPU types option HP7000_CPU # PCXS @@ -32,311 +33,191 @@ option HP8000_CPU # PCXU (in 32bit mode) option HP8200_CPU # PCXU2 (in 32bit mode) option HP8500_CPU # PCXW (in 32bit mode) option HP8700_CPU # PCXW2 (in 32bit mode) - option FPEMUL -option USELEDS # blink 'em -#option USER_PCICONF # user-space PCI configuration -option BOOT_CONFIG # add support for boot -c -# Need to set locally -maxusers 32 - -option TIMEZONE=0 # time zone to adjust RTC time by -option DST=0 # daylight saving time used by RTC - -option RAMDISK_HOOKS -option MINIROOTSIZE=5120 -config bsd root on rd0a swap on rd0b # and sd0b +config bsd root on rd0a swap on rd0b # and sd0b + +mainbus0 at root + +mem* at mainbus0 flags 0x0000 # /dev/*mem and memory controller +pdc0 at mainbus0 # PDC/IODC wrapper for boot console +power0 at mainbus0 # power/fail manager (iv 30) +cpu* at mainbus0 irq 31 # HP PA-RISC cpu +#fpu* at mainbus0 # HP PA-RISC fpu (iv N/A) +phantomas0 at mainbus0 # Phantom PseudoBC GSC+ Port +uturn0 at mainbus0 # U2/UTurn Runway IOA +uturn1 at mainbus0 +astro* at mainbus0 # Astro memory & I/O controller + +lasi0 at mainbus0 offset 0x100000 irq 28 # LASI host adapter +lasi0 at mainbus0 offset 0xfd00000 irq 28 # LASI on C1[01]0, J2[01]0 +lasi0 at phantomas0 offset 0xfd00000 irq 28 # LASI on [AB]* +lasi0 at uturn? offset 0xfd00000 irq 28 # LASI on [CJ]* +lasi1 at mainbus0 offset 0x500000 irq 27 # 712 GIO card +asp* at mainbus0 irq 28 # this one comes w/ Viper and LEDs +wax* at mainbus0 irq 24 # Wax may host EISA as well +wax* at phantomas0 irq 24 # Wax on [AB]* +wax* at uturn? irq 24 # Wax on C* +mongoose* at mainbus0 irq 17 # EISA Bus Adapter (i82350 or TI???) +dino0 at phantomas? irq 26 # PCI bus bridge on [AB]* +dino1 at phantomas? irq 25 +dino0 at uturn0 irq 26 # PCI bus bridge on [CJ]* +dino1 at uturn1 irq 25 +pci* at dino? +com1 at dino? irq 11 + +elroy* at astro? +pci* at elroy? + +ppb* at pci? +pci* at ppb? + +ssio* at pci? +com0 at ssio? irq 4 +com1 at ssio? irq 3 -mainbus0 at root # root bus - -mem* at mainbus0 flags 0x0000 # /dev/*mem and memory controller -pdc0 at mainbus0 # PDC/IODC wrapper for boot console -power0 at mainbus0 # power/fail manager (iv 30) -cpu* at mainbus0 irq 31 # HP PA-RISC cpu -#fpu* at mainbus0 # HP PA-RISC fpu (iv N/A) -#pmu* at mainbus0 irq 29 # HP PA-RISC performance monitor unit -phantomas0 at mainbus0 # Phantom PseudoBC GSC+ Port -uturn0 at mainbus0 # U2/UTurn Runway IOA -uturn1 at mainbus0 -astro* at mainbus0 # Astro memory & I/O controller - -lasi0 at mainbus0 offset 0x100000 irq 28 # LASI host adapter -lasi0 at mainbus0 offset 0xfd00000 irq 28 # LASI on C1[01]0, J2[01]0 -lasi0 at phantomas0 offset 0xfd00000 irq 28 # LASI on [AB]* -lasi0 at uturn? offset 0xfd00000 irq 28 # LASI on [CJ]* -lasi1 at mainbus0 offset 0x500000 irq 27 # 712 GIO card -asp* at mainbus0 irq 28 # this one comes w/ Viper and LEDs -wax* at mainbus0 irq 24 # Wax may host EISA as well -wax* at phantomas0 irq 24 # Wax on [AB]* -wax* at uturn? irq 24 # Wax on C* -mongoose* at mainbus0 irq 17 # EISA Bus Adapter (i82350 or TI???) -#vmeb* at mainbus0 irq ? # VME bus adapter -dino0 at phantomas? irq 26 # PCI bus bridge on [AB]* -dino1 at phantomas? irq 25 -dino0 at uturn0 irq 26 # PCI bus bridge on [CJ]* -dino1 at uturn1 irq 25 -pci* at dino? -option PCIVERBOSE -#pckbc0 at dino? irq 9 -com1 at dino? irq 11 - -elroy* at astro? -pci* at elroy? - -ppb* at pci? -pci* at ppb? - -ssio* at pci? -com0 at ssio? irq 4 -com1 at ssio? irq 3 - -# CardBus bus support cbb* at pci? cardslot* at cbb? -#option CARDBUS_DEBUG,CARDSLOT_DEBUG,CARDBUS_MAP_DEBUG cardbus* at cardslot? -#option PCMCIADEBUG,PCMCIAVERBOSE pcmcia* at cardslot? -# PCI USB Controllers -ehci* at pci? # Enhanced Host Controller -ehci* at cardbus? -ohci* at pci? # Open Host Controller -ohci* at cardbus? -uhci* at pci? # Universal Host Controller (Intel) - -# USB bus support -usb* at ehci? -usb* at uhci? -usb* at ohci? - -# USB devices -uhub* at usb? # USB Hubs -uhub* at uhub? # USB Hubs -#uftdi* at uhub? # FTDI FT8U100AX serial adapter -#ucom* at uftdi? -umass* at uhub? # USB Mass Storage devices -uhidev* at uhub? # Human Interface Devices -ums* at uhidev? # USB mouse -wsmouse* at ums? mux 0 -ukbd* at uhidev? # USB keyboard -wskbd* at ukbd? mux 1 -uhid* at uhidev? # USB generic HID support -aue* at uhub? # ADMtek AN986 Pegasus Ethernet -url* at uhub? # Realtek RTL8150L based adapters +ehci* at pci? +ehci* at cardbus? +ohci* at pci? +ohci* at cardbus? +uhci* at pci? +usb* at ehci? +usb* at uhci? +usb* at ohci? + +uhub* at usb? +uhub* at uhub? +umass* at uhub? +uhidev* at uhub? # Human Interface Devices +ukbd* at uhidev? # USB keyboard +wskbd* at ukbd? mux 1 +uhid* at uhidev? # USB generic HID support +aue* at uhub? # ADMtek AN986 Pegasus Ethernet +url* at uhub? # Realtek RTL8150L based adapters +atu* at uhub? # Atmel AT76c50x based 802.11b +axe* at uhub? # ASIX Electronics AX88172 USB Ethernet +axen* at uhub? # ASIX Electronics AX88179 USB Ethernet +cue* at uhub? # CATC USB-EL1201A based Ethernet +kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet +smsc* at uhub? # SMSC LAN95xx Ethernet +cdce* at uhub? # CDC Ethernet +udav* at uhub? # Davicom DM9601 based Ethernet +upl* at uhub? # Prolific PL2301/PL2302 host-to-host +ugl* at uhub? # Genesys Logic GL620USB-A host-to-host +wi* at uhub? # WaveLAN IEEE 802.11DS +ural* at uhub? # Ralink RT2500 + +sti0 at mainbus0 irq 11 # [H]CRX-{8,24,48}[Z] graphics +sti0 at phantomas0 irq 11 # builtin graphics on BC* +sti0 at uturn? irq 11 +sti1 at mainbus0 irq 12 +sti1 at phantomas0 irq 12 +sti1 at uturn? irq 12 +sti* at pci? # EG-PCI, FX* + +gsc0 at asp? # Snakes, old 715, old 725, 735/755 +gsc0 at lasi0 # 712,715/100,725/64,725/100,[ABCJ]* +gsc1 at lasi1 +gsc2 at wax? # it's another face of LASI + +eisa* at mongoose? + +hil* at gsc? irq 1 # Human Interface Loop, kbd and mouse +hilkbd* at hil? # keyboard, knob and buttons + +com0 at gsc0 offset 0x5000 irq 5 # on lasi +com1 at gsc1 offset 0x5000 irq 5 +com1 at gsc2 offset 0x2000 irq 6 # on wax +com0 at gsc0 offset 0x823000 irq 5 # on asp +com1 at gsc0 offset 0x822000 irq 6 +com2 at gsc0 offset 0x0 irq 13 # only on asp0 w/o audio (off ?) +com2 at gsc0 offset 0x4040 irq 13 # gecko's fax/voice/modems +com3 at gsc0 offset 0x4060 irq 13 + +ie0 at gsc0 irq 8 # 82C596DX/CA ether +osiop* at gsc? irq 9 # NCR 53C710 (Narrow SE) +oosiop* at gsc? irq 9 # NCR 53C700 (Narrow SE) +gsckbc* at gsc? irq 26 +pckbd* at gsckbc? # PS/2 keyboard +ahc* at pci? # Adaptec 2940 SCSI controllers +mpi* at pci? # LSI Logic Fusion MPT Message Passing Interface +qlw* at pci? # QLogic ISP SCSI +qla* at pci? # QLogic ISP 2[123]xx FibreChannel +option QLE_NOFIRMWARE +qle* at pci? # QLogic ISP 2[45]xx FibreChannel + +siop* at mainbus? irq 3 # NCR 53C720 (Fast/Wide HVD) +siop* at phantomas? irq 3 +siop* at uturn? irq 3 +siop* at pci? # NCR 53C8XX SCSI controllers +softraid0 at root + +em* at pci? # Intel Pro/1000 ethernet +dc* at pci? # 21143, "tulip" clone ethernet +rl* at pci? # RealTek 81[23]9 ethernet +xl* at pci? # 3C9xx ethernet +fxp* at pci? # EtherExpress 10/100B ethernet +ne* at pci? # NE2000-compatible Ethernet +ne* at pcmcia? +an* at pcmcia? +wi* at pcmcia? +skc* at pci? # SysKonnect GEnesis 984x +sk* at skc? # each port of above +mskc* at pci? # Marvell Yukon-2 +msk* at mskc? # each port of above +bge* at pci? # Broadcom BCM570x (aka Tigon3) +hme* at pci? # Sun Happy Meal +stge* at pci? # Sundance TC9021 GigE + +dcphy* at mii? # Digital Clone PHYs +acphy* at mii? # Altima AC101 PHYs +amphy* at mii? # AMD 79C873 PHYs +exphy* at mii? # 3Com internal PHYs +gentbi* at mii? # Generic 1000BASE-X ten-bit PHY +inphy* at mii? # Intel 82555 PHYs +iophy* at mii? # Intel 82553 PHYs +icsphy* at mii? # ICS1890 PHYs +lxtphy* at mii? # Level One LXT-970 PHYs +nsphy* at mii? # NS83840 PHYs +nsphyter* at mii? # NS83843 PHYs +mtdphy* at mii? # Myson MTD972 PHYs +qsphy* at mii? # Quality Semi QS6612 PHYs +luphy* at mii? # Lucent LU6612 PHY +sqphy* at mii? # Seeq 8022[013] PHYs +tqphy* at mii? # TDK Semiconductor PHYs +brgphy* at mii? # Broadcom 10/100/1000 PHYs +bmtphy* at mii? # Broadcom 10/100 PHYs +eephy* at mii? # Marvell 88E1000 Gigabit PHYs +xmphy* at mii? # XaQti XMAC-II PHYs +rlphy* at mii? # Realtek 8139 internal PHYs +urlphy* at mii? # Realtek RTL8150L internal PHY +rgephy* at mii? # Realtek 8169S/8110S PHY +ipgphy* at mii? # IC Plus IP1000A PHYs +ukphy* at mii? # generic unknown PHYs -# untested USB devices -#umodem* at uhub? # USB Modems/Serial -#ucom* at umodem? -#uvisor* at uhub? # Handspring Visor -#ucom* at uvisor? -#uvscom* at uhub? # SUNTAC Slipper U VS-10U serial -#ucom* at uvscom? -#ubsa* at uhub? # Belkin serial adapter -#ucom* at ubsa? -#uplcom* at uhub? # I/O DATA USB-RSAQ2 serial adapter -#ucom* at uplcom? -#umct* at uhub? # MCT USB-RS232 serial adapter -#ucom* at umct? -#uipaq* at uhub? # iPAQ serial adapter -#ucom* at uipaq? -#uaudio* at uhub? # USB Audio -#audio* at uaudio? -#umidi* at uhub? # USB MIDI -#midi* at umidi? -atu* at uhub? # Atmel AT76c50x based 802.11b -axe* at uhub? # ASIX Electronics AX88172 USB Ethernet -axen* at uhub? # ASIX Electronics AX88179 USB Ethernet -cue* at uhub? # CATC USB-EL1201A based Ethernet -kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet -smsc* at uhub? # SMSC LAN95xx Ethernet -cdce* at uhub? # CDC Ethernet -udav* at uhub? # Davicom DM9601 based Ethernet -upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' -ugl* at uhub? # Genesys Logic GL620USB-A host-to-host `network' -wi* at uhub? # WaveLAN IEEE 802.11DS -#urio* at uhub? # Diamond Multimedia Rio 500 -#udsbr* at uhub? # D-Link DSB-R100 radio -#radio* at udsbr? # USB radio -#ubt* at uhub? disable # USB Bluetooth -#ugen* at uhub? # USB Generic driver -ural* at uhub? # Ralink RT2500 - -sti0 at mainbus0 irq 11 # [H]CRX-{8,24,48}[Z] graphics -sti0 at phantomas0 irq 11 # builtin graphics on BC* -sti0 at uturn? irq 11 -sti1 at mainbus0 irq 12 -sti1 at phantomas0 irq 12 -sti1 at uturn? irq 12 -sti* at pci? # EG-PCI, FX* - -#medusa* at mainbus? irq 4 # FDDI -#venus* at mainbus? irq 5 # ATM J2498A/J3420A - -# internal i/o space -gsc0 at asp? # Snakes, old 715, old 725, 735/755 -gsc0 at lasi0 # 712,715/100,725/64,725/100,[ABCJ]* -gsc1 at lasi1 -gsc2 at wax? # it's another face of LASI - -#vme* at vmeb? -#option VMEVERBOSE -eisa* at mongoose? -#eisa* at wax? -option EISAVERBOSE -#isa* at mongoose? -#isa* at wax? - -# GSC devices - -hil* at gsc? irq 1 # Human Interface Loop, kbd and mouse -hilkbd* at hil? # keyboard, knob and buttons -#hilms* at hil? # mouse and tablets -#hilid* at hil? # ID module - -# RS/232 serial ports -com0 at gsc0 offset 0x5000 irq 5 # on lasi -com1 at gsc1 offset 0x5000 irq 5 -com1 at gsc2 offset 0x2000 irq 6 # on wax -com0 at gsc0 offset 0x823000 irq 5 # on asp -com1 at gsc0 offset 0x822000 irq 6 -com2 at gsc0 offset 0x0 irq 13 # only on asp0 w/o audio (off ?) -com2 at gsc0 offset 0x4040 irq 13 # gecko's fax/voice/modems -com3 at gsc0 offset 0x4060 irq 13 -#com* at pcmcia? # PCMCIA modems - -#lpt0 at gsc? irq 7 # both com and lpt are on WD16C552 -ie0 at gsc0 irq 8 # 82C596DX/CA ether -#ie1 at gsc1 irq 8 -#ie* at eisa? -#ie* at isa? port 0x360 iomem 0xd0000 irq 7 -#ie* at isa? port 0x300 irq 10 -#ie* at pci? -#tms* at gsc? irq 10 # TMS380C26 Network Controller -osiop* at gsc? irq 9 # NCR 53C710 (Narrow SE) -#osiop* at eisa? -oosiop* at gsc? irq 9 # NCR 53C700 (Narrow SE) -#harmony* at gsc? irq 13 # Audio Type 2 (CS4215/AD1849) -#audio* at harmony? -gsckbc* at gsc? irq 26 -pckbd* at gsckbc? # PS/2 keyboard -#pms* at gsckbc? # PS/2 mouse - -#sh* at eisa? # Interphase Seahawk 4811 EISA/FDDI -#ahb* at eisa? # Adaptec 174[024] SCSI controllers -#ahc* at eisa? # Adaptec 274x, aic7770 SCSI controllers -ahc* at pci? # Adaptec 2940 SCSI controllers -mpi* at pci? # LSI Logic Fusion MPT Message Passing Interface -#option BHADEBUG -#bha* at eisa? -#bha* at pci? -qlw* at pci? # QLogic ISP SCSI -qla* at pci? # QLogic ISP 2[123]xx FibreChannel -option QLE_NOFIRMWARE -qle* at pci? # QLogic ISP 2[45]xx FibreChannel - -siop* at mainbus? irq 3 # NCR 53C720 (Fast/Wide HVD) -siop* at phantomas? irq 3 -siop* at uturn? irq 3 -siop* at pci? # NCR 53C8XX SCSI controllers -#ahd* at pci? # Adaptec 79?? SCSI controllers -softraid0 at root # Software RAID - -em* at pci? # Intel Pro/1000 ethernet -#ti* at pci? # Alteon Tigon 1Gb ethernet -#txp* at pci? # 3com 3CR990 -#epic* at pci? # SMC EPIC/100 ethernet -#de* at pci? # 21x4[012]-based Ethernet -#de* at eisa? -dc* at pci? # 21143, "tulip" clone ethernet -#dc* at cardbus? -rl* at pci? # RealTek 81[23]9 ethernet -#rl* at cardbus? -#ep* at pci? # 3c59x ethernet -#ep* at eisa? # 3c579 ethernet -#ep* at pcmcia? # 3c589 ethernet -xl* at pci? # 3C9xx ethernet -#xl* at cardbus? -fxp* at pci? # EtherExpress 10/100B ethernet -#fxp* at cardbus? -ne* at pci? # NE2000-compatible Ethernet -ne* at pcmcia? -#atw* at pci? # ADMtek ADM8211 (802.11) -#atw* at cardbus? -#an* at pci? # Cisco/Aironet 802.11DS -an* at pcmcia? -#wi* at pci? # WaveLAN IEEE 802.11DS -wi* at pcmcia? -skc* at pci? # SysKonnect GEnesis 984x -sk* at skc? # each port of above -mskc* at pci? # Marvell Yukon-2 -msk* at mskc? # each port of above -bge* at pci? # Broadcom BCM570x (aka Tigon3) -hme* at pci? # Sun Happy Meal -stge* at pci? # Sundance TC9021 GigE - -dcphy* at mii? # Digital Clone PHYs -acphy* at mii? # Altima AC101 PHYs -amphy* at mii? # AMD 79C873 PHYs -exphy* at mii? # 3Com internal PHYs -gentbi* at mii? # Generic 1000BASE-X ten-bit PHY -inphy* at mii? # Intel 82555 PHYs -iophy* at mii? # Intel 82553 PHYs -icsphy* at mii? # ICS1890 PHYs -lxtphy* at mii? # Level One LXT-970 PHYs -nsphy* at mii? # NS83840 PHYs -nsphyter* at mii? # NS83843 PHYs -mtdphy* at mii? # Myson MTD972 PHYs -qsphy* at mii? # Quality Semi QS6612 PHYs -luphy* at mii? # Lucent LU6612 PHY -sqphy* at mii? # Seeq 8022[013] PHYs -#tlphy* at mii? # ThunderLAN PHYs -tqphy* at mii? # TDK Semiconductor PHYs -brgphy* at mii? # Broadcom 10/100/1000 PHYs -bmtphy* at mii? # Broadcom 10/100 PHYs -eephy* at mii? # Marvell 88E1000 Gigabit PHYs -xmphy* at mii? # XaQti XMAC-II PHYs -rlphy* at mii? # Realtek 8139 internal PHYs -urlphy* at mii? # Realtek RTL8150L internal PHY -rgephy* at mii? # Realtek 8169S/8110S PHY -ipgphy* at mii? # IC Plus IP1000A PHYs -ukphy* at mii? # generic unknown PHYs - -# MI devices -#wsdisplay* at vgafb? wsdisplay* at sti? wskbd* at pckbd? mux 1 wskbd* at hilkbd? mux 1 -#wsmouse* at pms? mux 0 -#wsmouse* at hilms? mux 0 - -#fdc* at gsc? # PC floppy controller (WD37C65C) -#fdc* at isa? port 0x3f0 irq 6 drq 2 -#option FD_DEBUG -#fd* at fdc? # floppy drives - -pciide* at pci? flags 0x0000 -#wdc0 at isa? port 0x1f0 irq 14 -#wdc1 at isa? port 0x170 irq 15 -wdc* at pcmcia? -wd* at wdc? flags 0x0000 -wd* at pciide? flags 0x0000 -atapiscsi* at pciide? - -# These entries find devices on all SCSI busses and assign -# unit numers dynamically. -scsibus* at scsi? -sd* at scsibus? -st* at scsibus? -cd* at scsibus? -#ch* at scsibus? -#uk* at scsibus? -pseudo-device rd 1 # ramdisk -pseudo-device loop 1 # network loopback -pseudo-device bpfilter 1 # packet filter -pseudo-device vlan # IEEE 802.1Q VLAN -pseudo-device ksyms 1 # kernel symbols device -pseudo-device wsmux 2 -pseudo-device bio 1 # ioctl multiplexing device +pciide* at pci? flags 0x0000 +wdc* at pcmcia? +wd* at wdc? flags 0x0000 +wd* at pciide? flags 0x0000 +atapiscsi* at pciide? + +scsibus* at scsi? +sd* at scsibus? +st* at scsibus? +cd* at scsibus? + +pseudo-device rd 1 +pseudo-device loop 1 +pseudo-device bpfilter 1 +pseudo-device vlan +pseudo-device wsmux 2 +pseudo-device bio 1 diff --git a/sys/arch/hppa64/conf/RAMDISK b/sys/arch/hppa64/conf/RAMDISK index b72406d768f..d73cb721a40 100644 --- a/sys/arch/hppa64/conf/RAMDISK +++ b/sys/arch/hppa64/conf/RAMDISK @@ -1,188 +1,70 @@ -# $OpenBSD: RAMDISK,v 1.20 2014/07/12 21:56:56 tedu Exp $ -# -# Diskless kernel config -# +# $OpenBSD: RAMDISK,v 1.21 2014/10/10 05:43:35 deraadt Exp $ -# Machine architecture; required by config(8) machine hppa64 +maxusers 4 -option DDB # in-kernel debugger - -option FFS # UFS -option NFSCLIENT # Network File System client -option CD9660 # ISO 9660 + Rock Ridge file system -option INET # IP + ICMP + TCP + UDP -option INET6 # IPv6 (needs INET) - -#option USER_PCICONF # user-space PCI configuration -option BOOT_CONFIG # add support for boot -c - -# Need to set locally -maxusers 32 - -option TIMEZONE=0 # time zone to adjust RTC time by -option DST=0 # daylight saving time used by RTC +option TIMEZONE=0 +option DST=0 +option SMALL_KERNEL +option NO_PROPOLICE +option BOOT_CONFIG option RAMDISK_HOOKS option MINIROOTSIZE=5120 -config bsd root on rd0a swap on rd0b # and sd0b -mainbus0 at root # root bus +option PCIVERBOSE -mem* at mainbus0 flags 0x00 # /dev/*mem and memory controller -pdc0 at mainbus0 # PDC/IODC wrapper for boot console -power0 at mainbus0 # power/fail manager (iv 30) -cpu* at mainbus0 # HP PA-RISC cpu -plut0 at mainbus0 # Astro Runway-Ropes, MIOC and IOA +option FFS +option NFSCLIENT +option CD9660 +option INET +option INET6 -option PCIVERBOSE -elroy* at plut0 -pci* at elroy? +config bsd root on rd0a swap on rd0b # and sd0b -ppb* at pci? -pci* at ppb? +mainbus0 at root -#goofy* at pci? # NS87560UBD -#com* at goofy? -#lpt* at goofy? -#fdc* at goofy? +mem* at mainbus0 flags 0x00 # /dev/*mem and memory controller +pdc0 at mainbus0 # PDC/IODC wrapper for boot console +power0 at mainbus0 # power/fail manager (iv 30) +cpu* at mainbus0 # HP PA-RISC cpu +plut0 at mainbus0 # Astro Runway-Ropes, MIOC and IOA + +elroy* at plut0 +pci* at elroy? + +ppb* at pci? +pci* at ppb? -# CardBus bus support cbb* at pci? cardslot* at cbb? -#option CARDBUS_DEBUG,CARDSLOT_DEBUG,CARDBUS_MAP_DEBUG cardbus* at cardslot? -#option PCMCIADEBUG,PCMCIAVERBOSE pcmcia* at cardslot? -# PCI USB Controllers -#ehci* at pci? # Enhanced Host Controller -#uhci* at pci? # Universal Host Controller (Intel) -#ohci* at pci? # Open Host Controller - -# USB bus support -#usb* at ehci? -#usb* at uhci? -#usb* at ohci? - -# USB devices -#uhub* at usb? # USB Hubs -#uhub* at uhub? # USB Hubs -#umodem* at uhub? # USB Modems/Serial -#ucom* at umodem? -#uvisor* at uhub? # Handspring Visor -#ucom* at uvisor? -#uvscom* at uhub? # SUNTAC Slipper U VS-10U serial -#ucom* at uvscom? -#ubsa* at uhub? # Belkin serial adapter -#ucom* at ubsa? -#uftdi* at uhub? # FTDI FT8U100AX serial adapter -#ucom* at uftdi? -#uplcom* at uhub? # I/O DATA USB-RSAQ2 serial adapter -#ucom* at uplcom? -#umct* at uhub? # MCT USB-RS232 serial adapter -#ucom* at umct? -#uaudio* at uhub? # USB Audio -#audio* at uaudio? -#umidi* at uhub? # USB MIDI -#midi* at umidi? -#ulpt* at uhub? # USB Printers -#umass* at uhub? # USB Mass Storage devices -#uhidev* at uhub? # Human Interface Devices -#ums* at uhidev? # USB mouse -#wsmouse* at ums? mux 0 -#ukbd* at uhidev? # USB keyboard -#wskbd* at ukbd? mux 1 -#uhid* at uhidev? # USB generic HID support -#aue* at uhub? # ADMtek AN986 Pegasus Ethernet -#axe* at uhub? # ASIX Electronics AX88172 USB Ethernet -#axen* at uhub? # ASIX Electronics AX88179 USB Ethernet -#cue* at uhub? # CATC USB-EL1201A based Ethernet -#kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet -#smsc* at uhub? # SMSC LAN95xx Ethernet -#cdce* at uhub? # CDC Ethernet -#udav* at uhub? # Davicom DM9601 based Ethernet -#upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' -#ugl* at uhub? # Genesys Logic GL620USB-A host-to-host `network' -#url* at uhub? # Realtek RTL8150L based adapters -#wi* at uhub? # WaveLAN IEEE 802.11DS -#urio* at uhub? # Diamond Multimedia Rio 500 -#udsbr* at uhub? # D-Link DSB-R100 radio -#radio* at udsbr? # USB radio -#ugen* at uhub? # USB Generic driver - -#sti* at pci? # EG-PCI, FX* -#wsdisplay* at sti? - -#com* at pcmcia? # PCMCIA modems - -#ie* at pci? - -#ep* at pci? # 3c59x ethernets -ahc* at pci? # Adaptec 2940 SCSI controllers -#option BHADEBUG -#bha* at pci? - -siop* at pci? # NCR 538XX SCSI controllers(new) -#ahd* at pci? # Adaptec 79?? SCSI controllers - -#em* at pci? # Intel Pro/1000 ethernet -#ti* at pci? # Alteon Tigon 1Gb ethernet -#txp* at pci? # 3com 3CR990 -#epic* at pci? # SMC EPIC/100 ethernet -dc* at pci? # 21143, "tulip" clone ethernet -#dc* at cardbus? -#rl* at pci? # RealTek 81[23]9 ethernet -#rl* at cardbus? -#ep* at pci? # 3c59x -#ep* at cardbus? -#xl* at pci? # 3C9xx ethernet -#xl* at cardbus? -fxp* at pci? # EtherExpress 10/100B ethernet -#fxp* at cardbus? -ne* at pci? # NE2000-compatible Ethernet -ne* at pcmcia? -#an* at pci? # Cisco/Aironet 802.11DS -an* at pcmcia? -#wi* at pci? # WaveLAN IEEE 802.11DS -wi* at pcmcia? +ahc* at pci? # Adaptec 2940 SCSI controllers +siop* at pci? # NCR 538XX SCSI controllers(new) + +dc* at pci? # 21143, "tulip" clone ethernet +fxp* at pci? # EtherExpress 10/100B ethernet +ne* at pci? # NE2000-compatible Ethernet +ne* at pcmcia? +an* at pcmcia? +wi* at pcmcia? dcphy* at mii? # Digital Clone PHYs amphy* at mii? # AMD 79C873 PHYs -#exphy* at mii? # 3Com internal PHYs inphy* at mii? # Intel 82555 PHYs -#iophy* at mii? # Intel 82553 PHYs icsphy* at mii? # ICS1890 PHYs lxtphy* at mii? # Level One LXT-970 PHYs nsphy* at mii? # NS83840 PHYs nsphyter* at mii? # NS83843 PHYs -#mtdphy* at mii? # Myson MTD972 PHYs -#qsphy* at mii? # Quality Semi QS6612 PHYs -#sqphy* at mii? # Seeq 8022[013] PHYs -#tlphy* at mii? # ThunderLAN PHYs -#tqphy* at mii? # TDK Semiconductor PHYs -#brgphy* at mii? # Broadcom 10/100/1000 PHYs bmtphy* at mii? # Broadcom 10/100 PHYs -#eephy* at mii? # Marvell 88E1000 Gigabit PHYs ukphy* at mii? # generic unknown PHYs -#pciide* at pci? flags 0x0000 -#wdc* at pcmcia? -#wd* at wdc? flags 0x0000 -#wd* at pciide? flags 0x0000 -#atapiscsi* at pciide? - -# These entries find devices on all SCSI busses and assign -# unit numers dynamically. -scsibus* at scsi? -sd* at scsibus? -st* at scsibus? -cd* at scsibus? -ch* at scsibus? -uk* at scsibus? - -pseudo-device rd 1 # ramdisk -pseudo-device loop 1 # network loopback -pseudo-device bpfilter 1 # packet filter -pseudo-device pty 16 # pseudo-terminals -pseudo-device ksyms 1 # kernel symbols device +scsibus* at scsi? +sd* at scsibus? +cd* at scsibus? + +pseudo-device rd 1 +pseudo-device loop 1 +pseudo-device bpfilter 1 diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK index 531c09a6086..460f244fe62 100644 --- a/sys/arch/i386/conf/RAMDISK +++ b/sys/arch/i386/conf/RAMDISK @@ -1,36 +1,27 @@ -# $OpenBSD: RAMDISK,v 1.185 2014/07/15 22:12:10 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.186 2014/10/10 05:43:35 deraadt Exp $ -machine i386 # architecture, used by config; REQUIRED - -option SCSITERSE +machine i386 +maxusers 4 +option TIMEZONE=0 +option DST=0 option SMALL_KERNEL option NO_PROPOLICE - -maxusers 4 # estimated number of users -option TIMEZONE=0 # time zone to adjust RTC time by -option DST=0 # daylight saving time used by RTC - -#makeoptions DEBUG="-g" # compile full symbol table - -option FFS # UFS -#option EXT2FS # Linux ext2fs - -#option NFSCLIENT # Network File System client - -#option CD9660 # ISO 9660 + Rock Ridge file system -option MSDOSFS # MS-DOS file system - -option INET # IP + ICMP + TCP + UDP - -option BOOT_CONFIG # boot-time kernel config +option BOOT_CONFIG option RAMDISK_HOOKS option MINIROOTSIZE=3872 -config bsd root on rd0a swap on rd0b and wd0b and sd0b +option PCIVERBOSE +option SCSITERSE + +option FFS +option MSDOSFS +option INET -mainbus0 at root +config bsd root on rd0a swap on rd0b and wd0b and sd0b + +mainbus0 at root acpi0 at bios? #acpitimer* at acpi? @@ -44,51 +35,33 @@ acpimadt0 at acpi? acpiprt* at acpi? #acpitz* at acpi? -cpu0 at mainbus? -bios0 at mainbus0 -ioapic* at mainbus? -apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 -#option APMDEBUG -mpbios0 at bios0 -pcibios0 at bios0 flags 0x0000 - -isa0 at mainbus0 -isa0 at pcib? -#isa0 at amdpcib? -#isa0 at ichpcib? -#isa0 at gscpcib? -#isa0 at glxpcib? -#eisa0 at mainbus0 -pci* at mainbus0 - -option PCIVERBOSE -#option EISAVERBOSE - -pchb* at pci? # PCI-Host bridges -ppb* at pci? # PCI-PCI bridges -pci* at ppb? -pci* at pchb? -pcib* at pci? # PCI-ISA bridge -#ichpcib* at pci? # Intel ICHx/ICHx-M LPC bridges -#gscpcib* at pci? # NS Geode SC1100 PCI-ISA bridge -#amdpcib* at pci? # AMD 8111 LPC bridge -geodesc* at pci? # Geode SC1100/SCx200 IAOC -#glxpcib* at pci? # AMD CS5536 PCI-ISA bridge - -# ISA PCMCIA controllers -pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000 -pcic1 at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000 -pcic2 at isa? port 0x3e4 iomem 0xd4000 iosiz 0x4000 - -# PCI PCMCIA controllers -pcic* at pci? - -# PCMCIA bus support -pcmcia* at pcic? - -npx0 at isa? port 0xf0 irq 13 # math coprocessor -isadma0 at isa? -isapnp0 at isa? +cpu0 at mainbus? +bios0 at mainbus0 +ioapic* at mainbus? +apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 +mpbios0 at bios0 +pcibios0 at bios0 flags 0x0000 + +isa0 at mainbus0 +isa0 at pcib? +pci* at mainbus0 + +pchb* at pci? # PCI-Host bridges +ppb* at pci? # PCI-PCI bridges +pci* at ppb? +pci* at pchb? +pcib* at pci? # PCI-ISA bridge +geodesc* at pci? # Geode SC1100/SCx200 IAOC + +pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000 +pcic1 at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000 +pcic2 at isa? port 0x3e4 iomem 0xd4000 iosiz 0x4000 +pcic* at pci? +pcmcia* at pcic? + +npx0 at isa? port 0xf0 irq 13 # math coprocessor +isadma0 at isa? +isapnp0 at isa? pckbc0 at isa? # PC keyboard controller pckbd* at pckbc? # PC keyboard @@ -99,165 +72,75 @@ pcdisplay0 at isa? # CGA, MDA, EGA, HGA wsdisplay* at vga? wsdisplay* at pcdisplay? -com0 at isa? port 0x3f8 irq 4 # standard PC serial ports -com1 at isa? port 0x2f8 irq 3 -com2 at isa? port 0x3e8 irq 5 -#com3 at isa? port 0x2e8 irq 9 -#ast0 at isa? port 0x1a0 irq 5 # AST 4-port serial cards -#com* at ast? -#boca0 at isa? port 0x100 irq 5 # BOCA 8-port serial cards -#com* at boca? -#rtfps0 at isa? port 0x1230 irq 10 # RT 4-port serial cards -#com* at rtfps? -#com* at pcmcia? # PCMCIA modem cards -com* at isapnp? - -# option for using CD1400 handshaking for incoming data -# requires a special cable that exchanges the RTS and DTR lines -# options CY_HW_RTS -#cy0 at isa? iomem 0xd4000 irq 12 # ISA cyclom card -#cy* at pci? # PCI cyclom card - -#lpt0 at isa? port 0x378 irq 7 # standard PC parallel ports -#lpt1 at isa? port 0x278 -#lpt2 at isa? port 0x3bc - - -#bha0 at isa? port 0x330 # BusLogic [57]4X SCSI controllers -#bha1 at isa? disable port 0x334 # BusLogic [57]4X SCSI controllers -#bha2 at isa? disable -#bha* at pci? -#bha* at eisa? # XXX eisa still runs in isa-compat -#aha0 at isa? port 0x330 # Adaptec 154[02] SCSI controllers -#aha1 at isa? port 0x334 # Adaptec 154[02] SCSI controllers -#aha* at isapnp? -#ahb* at eisa? # Adaptec 174[024] SCSI controllers -#ahc0 at isa? # Adaptec 284x SCSI controllers -#ahc* at eisa? # Adaptec 274x, aic7770 SCSI controllers -#ahc* at pci? # Adaptec 2940 SCSI controllers -#ahd* at pci? # Adaptec 79?? SCSI controllers -#twe* at pcu? # 3ware Escalade RAID controllers -#aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers -#aic* at isapnp? -#aic* at pcmcia? # PCMCIA based aic SCSI controllers -#siop* at pci? # NCR 538XX SCSI controllers(new) -#adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI -#adw* at pci? # AdvanSys ULTRA WIDE SCSI -#sea0 at isa? iomem 0xc8000 irq 5 # Seagate ST0[12] SCSI controllers -#uha0 at isa? port 0x330 # UltraStor [13]4f SCSI controllers -#uha1 at isa? port 0x334 # UltraStor [13]4f SCSI controllers -#uha* at eisa? # UltraStor 24f SCSI controllers -#wds0 at isa? port 0x350 irq 15 drq 6 # WD7000 and TMC-7000 controllers -#wds1 at isa? port 0x358 irq 11 drq 5 - -scsibus* at scsi? -sd* at scsibus? # SCSI disk drives -#st* at scsibus? # SCSI tape drives -cd* at scsibus? # SCSI CD-ROM drives -#ch* at scsibus? # SCSI autochangers -#uk* at scsibus? # SCSI unknown devices - -fdc0 at isa? port 0x3f0 irq 6 drq 2 # standard PC floppy controllers -#fdc1 at isa? port 0x370 -fd* at fdc? - -# IDE controllers -pciide* at pci? flags 0x0000 - -wdc0 at isa? port 0x1f0 irq 14 flags 0x00 -wdc1 at isa? port 0x170 irq 15 flags 0x00 -wdc* at pcmcia? -wdc* at isapnp? - -# IDE hard drives -wd* at wdc? flags 0x0000 -wd* at pciide? flags 0x0000 - -# ATAPI<->SCSI -atapiscsi* at wdc? -atapiscsi* at pciide? - -we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC 80x3 ethernet series -we1 at isa? port 0x300 iomem 0xcc000 irq 10 # -we* at isapnp? -#ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3C503 ethernet card -ne0 at isa? port 0x240 irq 9 # NE[12]000 ethernet card -ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet card -ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet -ne* at isapnp? # NE[12]000 PnP ethernet cards -#eg0 at isa? port 0x310 irq 5 # 3C505/Etherlink+ ethernet cards -#el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards -ep0 at isa? # 3C509 ethernet cards -ep* at isa? # 3C509 ethernet cards -#ef* at isapnp? # 3C515 PnP ethernet -#ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN and 3C507 -#ie1 at isa? port 0x300 irq 10 # EtherExpress -le0 at isa? port 0x360 irq 15 drq 6 # IsoLan, NE2100, and DEPCA -#ex0 at isa? port 0x320 irq 5 # Intel EtherExpress PRO/10 -#ep* at eisa? # 3C579 ethernet cards -ep* at isapnp? # 3C509 PnP ethernet cards -le* at isapnp? -de* at pci? # DC21X4X-based ethernet cards -fxp* at pci? # EtherExpress 10/100B ethernet cards -ep* at pci? # 3C59x ethernet cards -ne* at pci? # NE2000-compat ethernet cards -ne* at pcmcia? # PCMCIA based NE2000 cards -ep* at pcmcia? # PCMCIA based 3c5xx cards -#sm* at pcmcia? # PCMCIA based sm cards -#xe* at pcmcia? # Xircom ethernet -xl* at pci? # 3C9xx ethernet cards -rl* at pci? # RealTek 81[23]9 ethernet -#epic* at pci? # SMC EPIC/100 ethernet -#tl* at pci? # Compaq Thunderlan ethernet cards -vr* at pci? # VIA Rhine ethernet -#wb* at pci? # Winbond W89C840F ethernet -dc* at pci? # 21143, "tulip" clone ethernet -#dc* at cardbus? # 21143, "tulip" clone ethernet -sis* at pci? # SiS 900/7016 ethernet -#ste* at pci? # Sundance ST201 ethernet -#ti* at pci? # Alteon Tigon 1Gb ethernet -#skc* at pci? # SysKonnect GEnesis 984x -#sk* at skc? # each port of above -em* at pci? # Intel Pro/1000 ethernet -#txp* at pci? # 3com 3CR990 -#nge* at pci? # NS DP83820/DP83821 GigE -#bge* at pci? # Broadcom BCM570x (aka Tigon3) -#stge* at pci? # Sundance TC9021 GigE -#lge* at pci? # Level1 LXT1001 GigE -#hme* at pci? # Sun Happy Meal -re* at pci? # Realtek 8169/8169S/8110S -vge* at pci? # VIA VT612x -nfe* at pci? # NVIDIA nForce Ethernet -#pcn* at pci? # AMD PCnet-PCI Ethernet - -# Wireless network cards -wi* at pci? # WaveLAN IEEE 802.11DS -wi* at pcmcia? # WaveLAN IEEE 802.11DS -#an* at pcmcia? # Aironet IEEE 802.11DS -#cnw* at pcmcia? # Xircom Netwave - -# Media Independent Interface (mii) drivers -exphy* at mii? # 3Com internal PHYs -inphy* at mii? # Intel 82555 PHYs -iophy* at mii? # Intel 82553 PHYs -icsphy* at mii? # ICS 1890 PHYs -#lxtphy* at mii? # Level1 LXT970 PHYs -nsphy* at mii? # NS and compatible PHYs +com0 at isa? port 0x3f8 irq 4 # standard PC serial ports +com1 at isa? port 0x2f8 irq 3 +com2 at isa? port 0x3e8 irq 5 +com* at isapnp? + +scsibus* at scsi? +sd* at scsibus? # SCSI disk drives +cd* at scsibus? # SCSI CD-ROM drives + +fdc0 at isa? port 0x3f0 irq 6 drq 2 # standard PC floppy controllers +fd* at fdc? + +pciide* at pci? flags 0x0000 +wdc0 at isa? port 0x1f0 irq 14 flags 0x00 +wdc1 at isa? port 0x170 irq 15 flags 0x00 +wdc* at pcmcia? +wdc* at isapnp? +wd* at wdc? flags 0x0000 +wd* at pciide? flags 0x0000 +atapiscsi* at wdc? +atapiscsi* at pciide? + +we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC 80x3 ethernet series +we1 at isa? port 0x300 iomem 0xcc000 irq 10 # +we* at isapnp? +ne0 at isa? port 0x240 irq 9 # NE[12]000 ethernet card +ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet card +ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet +ne* at isapnp? # NE[12]000 PnP ethernet cards +ep0 at isa? # 3C509 ethernet cards +ep* at isa? # 3C509 ethernet cards +le0 at isa? port 0x360 irq 15 drq 6 # IsoLan, NE2100, and DEPCA +ep* at isapnp? # 3C509 PnP ethernet cards +le* at isapnp? +de* at pci? # DC21X4X-based ethernet cards +fxp* at pci? # EtherExpress 10/100B ethernet cards +ep* at pci? # 3C59x ethernet cards +ne* at pci? # NE2000-compat ethernet cards +ne* at pcmcia? # PCMCIA based NE2000 cards +ep* at pcmcia? # PCMCIA based 3c5xx cards +xl* at pci? # 3C9xx ethernet cards +rl* at pci? # RealTek 81[23]9 ethernet +vr* at pci? # VIA Rhine ethernet +dc* at pci? # 21143, "tulip" clone ethernet +sis* at pci? # SiS 900/7016 ethernet +em* at pci? # Intel Pro/1000 ethernet +re* at pci? # Realtek 8169/8169S/8110S +vge* at pci? # VIA VT612x +nfe* at pci? # NVIDIA nForce Ethernet +wi* at pci? # WaveLAN IEEE 802.11DS +wi* at pcmcia? # WaveLAN IEEE 802.11DS + +exphy* at mii? # 3Com internal PHYs +inphy* at mii? # Intel 82555 PHYs +iophy* at mii? # Intel 82553 PHYs +icsphy* at mii? # ICS 1890 PHYs +nsphy* at mii? # NS and compatible PHYs nsphyter* at mii? # NS and compatible PHYs -#qsphy* at mii? # Quality Semi QS6612 PHYs -#sqphy* at mii? # Seeq 8x220 PHYs -rlphy* at mii? # RealTek 8139 internal PHYs -mtdphy* at mii? # Myson MTD972 PHYs -dcphy* at mii? # Digital Clone PHYs -amphy* at mii? # AMD 79C873 PHYs -tqphy* at mii? # TDK 78Q212x PHYs -bmtphy* at mii? # Broadcom 10/100 PHYs -rgephy* at mii? # Realtek 8169S/8110S PHY -ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY -#ipgphy* at mii? # IC Plus IP1000A PHYs -ukphy* at mii? # "unknown" PHYs - -pseudo-device loop 1 # network loopback -pseudo-device bpfilter 1 # packet filter -pseudo-device rd 1 # ramdisk -pseudo-device wsmux 2 +rlphy* at mii? # RealTek 8139 internal PHYs +mtdphy* at mii? # Myson MTD972 PHYs +dcphy* at mii? # Digital Clone PHYs +amphy* at mii? # AMD 79C873 PHYs +tqphy* at mii? # TDK 78Q212x PHYs +bmtphy* at mii? # Broadcom 10/100 PHYs +rgephy* at mii? # Realtek 8169S/8110S PHY +ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY +ukphy* at mii? # "unknown" PHYs + +pseudo-device loop 1 +pseudo-device bpfilter 1 +pseudo-device rd 1 +pseudo-device wsmux 2 diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB index cc3f438c900..613c61bb3f4 100644 --- a/sys/arch/i386/conf/RAMDISKB +++ b/sys/arch/i386/conf/RAMDISKB @@ -1,36 +1,26 @@ -# $OpenBSD: RAMDISKB,v 1.128 2014/07/15 22:12:10 deraadt Exp $ +# $OpenBSD: RAMDISKB,v 1.129 2014/10/10 05:43:35 deraadt Exp $ -machine i386 # architecture, used by config; REQUIRED - -option SCSITERSE +machine i386 +maxusers 4 +option TIMEZONE=0 +option DST=0 option SMALL_KERNEL option NO_PROPOLICE - -maxusers 4 # estimated number of users -option TIMEZONE=0 # time zone to adjust RTC time by -option DST=0 # daylight saving time used by RTC - -#makeoptions DEBUG="-g" # compile full symbol table - -option FFS # UFS -#option EXT2FS # Linux ext2fs - -#option NFSCLIENT # Network File System client - -#option CD9660 # ISO 9660 + Rock Ridge file system -#option MSDOSFS # MS-DOS file system - -option INET # IP + ICMP + TCP + UDP - -option BOOT_CONFIG # boot-time kernel config +option BOOT_CONFIG option RAMDISK_HOOKS option MINIROOTSIZE=3872 -config bsd root on rd0a swap on rd0b and wd0b and sd0b +option PCIVERBOSE +option SCSITERSE + +option FFS +option INET -mainbus0 at root +config bsd root on rd0a swap on rd0b and wd0b and sd0b + +mainbus0 at root acpi0 at bios? #acpitimer* at acpi? @@ -44,50 +34,26 @@ acpimadt0 at acpi? acpiprt* at acpi? #acpitz* at acpi? -cpu0 at mainbus? -bios0 at mainbus0 -ioapic* at mainbus? -apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 -#option APMDEBUG -pcibios0 at bios0 flags 0x0000 - -isa0 at mainbus0 -isa0 at pcib? -#isa0 at ichpcib? -#isa0 at amdpcib? -#isa0 at gscpcib? -#isa0 at glxpcib? -#eisa0 at mainbus0 -pci* at mainbus0 - -option PCIVERBOSE -#option EISAVERBOSE - -pchb* at pci? # PCI-Host bridges -ppb* at pci? # PCI-PCI bridges -pci* at ppb? -pci* at pchb? -pcib* at pci? # PCI-ISA bridge -#ichpcib* at pci? # Intel ICHx/ICHx-M LPC bridges -#amdpcib* at pci? # AMD 8111 LPC bridge -#gscpcib* at pci? # NS Geode SC1100 PCI-ISA bridge -#glxpcib* at pci? # AMD CS5536 PCI-ISA bridge -geodesc* at pci? # Geode SC1100/SCx200 IAOC - -# ISA PCMCIA controllers -#pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000 -#pcic1 at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000 -#pcic2 at isa? port 0x3e4 iomem 0xd4000 iosiz 0x4000 +cpu0 at mainbus? +bios0 at mainbus0 +ioapic* at mainbus? +apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 +pcibios0 at bios0 flags 0x0000 -# PCI PCMCIA controllers -#pcic* at pci? +isa0 at mainbus0 +isa0 at pcib? +pci* at mainbus0 -# PCMCIA bus support -#pcmcia* at pcic? +pchb* at pci? # PCI-Host bridges +ppb* at pci? # PCI-PCI bridges +pci* at ppb? +pci* at pchb? +pcib* at pci? # PCI-ISA bridge +geodesc* at pci? # Geode SC1100/SCx200 IAOC -npx0 at isa? port 0xf0 irq 13 # math coprocessor -isadma0 at isa? -isapnp0 at isa? +npx0 at isa? port 0xf0 irq 13 # math coprocessor +isadma0 at isa? +isapnp0 at isa? pckbc0 at isa? # PC keyboard controller pckbd* at pckbc? # PC keyboard @@ -98,175 +64,59 @@ pcdisplay0 at isa? # CGA, MDA, EGA, HGA wsdisplay* at vga? wsdisplay* at pcdisplay? -com0 at isa? port 0x3f8 irq 4 # standard PC serial ports -com1 at isa? port 0x2f8 irq 3 -com2 at isa? port 0x3e8 irq 5 -#com3 at isa? port 0x2e8 irq 9 -#ast0 at isa? port 0x1a0 irq 5 # AST 4-port serial cards -#com* at ast? -#boca0 at isa? port 0x100 irq 5 # BOCA 8-port serial cards -#com* at boca? -#rtfps0 at isa? port 0x1230 irq 10 # RT 4-port serial cards -#com* at rtfps? -#com* at pcmcia? # PCMCIA modem cards -#com* at isapnp? - -# option for using CD1400 handshaking for incoming data -# requires a special cable that exchanges the RTS and DTR lines -# options CY_HW_RTS -#cy0 at isa? iomem 0xd4000 irq 12 # ISA cyclom card -#cy* at pci? # PCI cyclom card - -#lpt0 at isa? port 0x378 irq 7 # standard PC parallel ports -#lpt1 at isa? port 0x278 -#lpt2 at isa? port 0x3bc - -#bha0 at isa? port 0x330 # BusLogic [57]4X SCSI controllers -#bha1 at isa? disable port 0x334 # BusLogic [57]4X SCSI controllers -#bha2 at isa? disable -#bha* at pci? -#bha* at eisa? # XXX eisa still runs in isa-compat -#aha0 at isa? port 0x330 # Adaptec 154[02] SCSI controllers -#aha1 at isa? port 0x334 # Adaptec 154[02] SCSI controllers -#aha* at isapnp? -#ahb* at eisa? # Adaptec 174[024] SCSI controllers -ahc0 at isa? # Adaptec 284x SCSI controllers -#ahc* at eisa? # Adaptec 274x, aic7770 SCSI controllers -#ahc* at pci? # Adaptec 2940 SCSI controllers -ahd* at pci? # Adaptec 79?? SCSI controllers -mpi* at pci? # LSI Logic Fusion-MPT Message Passing Interface -#gdt* at pci? # ICP Vortex GDT RAID controllers -#aac* at pci? # Adaptec FSA RAID controllers -ami* at pci? # AMI MegaRAID controllers -mfi* at pci? # LSI MegaRAID SAS controllers -#cac* at pci? # Compaq Smart ARRAY [234]* RAID controllers -#cac* at eisa? -#ciss* at pci? # Compaq Smart ARRAY [56]* RAID controllers -#twe* at pci? # 3ware Escalade RAID controllers -#iha* at pci? # Initio Ultra/UltraWide SCSI controllers -#aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers -#aic* at isapnp? -#siop* at pci? # NCR 538XX SCSI controllers(new) -#adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI -#adw* at pci? # AdvanSys ULTRA WIDE SCSI -#pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI -#sea0 at isa? iomem 0xc8000 irq 5 # Seagate ST0[12] SCSI controllers -#trm* at pci? # Tekram DC-3x5U SCSI Controllers -#uha0 at isa? port 0x330 # UltraStor [13]4f SCSI controllers -#uha1 at isa? port 0x334 # UltraStor [13]4f SCSI controllers -#uha* at eisa? # UltraStor 24f SCSI controllers -#wds0 at isa? port 0x350 irq 15 drq 6 # WD7000 and TMC-7000 controllers -#wds1 at isa? port 0x358 irq 11 drq 5 - -scsibus* at scsi? -sd* at scsibus? # SCSI disk drives -#st* at scsibus? # SCSI tape drives -#cd* at scsibus? # SCSI CD-ROM drives -#ch* at scsibus? # SCSI autochangers -#uk* at scsibus? # SCSI unknown devices - -fdc0 at isa? port 0x3f0 irq 6 drq 2 # standard PC floppy controllers -#fdc1 at isa? port 0x370 -fd* at fdc? - -# IDE controllers -pciide* at pci? flags 0x0000 - -wdc0 at isa? port 0x1f0 irq 14 flags 0x00 -wdc1 at isa? port 0x170 irq 15 flags 0x00 -#wdc* at pcmcia? -#wdc* at isapnp? - -# IDE hard drives -wd* at wdc? flags 0x0000 -wd* at pciide? flags 0x0000 - -# I2O -#iop* at pci? # I2O processor -#ioprbs* at iop? # I2O arrays -#iopsp* at iop? # I2O SCSI pass-through - -# ATAPI<->SCSI -atapiscsi* at wdc? -atapiscsi* at pciide? - -#we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC 80x3 ethernet series -#we1 at isa? port 0x300 iomem 0xcc000 irq 10 # -#we* at isapnp? -#ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3C503 ethernet card -#ne0 at isa? port 0x240 irq 9 # NE[12]000 ethernet card -#ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet card -#ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet -#ne* at isapnp? # NE[12]000 PnP ethernet cards -#eg0 at isa? port 0x310 irq 5 # 3C505/Etherlink+ ethernet cards -#el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards -#ep0 at isa? # 3C509 ethernet cards -#ep* at isa? # 3C509 ethernet cards -#ef* at isapnp? # 3C515 PnP ethernet -#ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN and 3C507 -#ie1 at isa? port 0x300 irq 10 # EtherExpress -#le0 at isa? port 0x360 irq 15 drq 6 # IsoLan, NE2100, and DEPCA -#ex0 at isa? port 0x320 irq 5 # Intel EtherExpress PRO/10 -#ep* at eisa? # 3C579 ethernet cards -#ep* at isapnp? # 3C509 PnP ethernet cards -#le* at isapnp? -de* at pci? # DC21X4X-based ethernet cards -fxp* at pci? # EtherExpress 10/100B ethernet cards -ep* at pci? # 3C59x ethernet cards -#ne* at pci? # NE2000-compat ethernet cards -#ne* at pcmcia? # PCMCIA based NE2000 cards -#ep* at pcmcia? # PCMCIA based 3c5xx cards -#sm* at pcmcia? # PCMCIA based sm cards -#xe* at pcmcia? # Xircom ethernet -#xl* at pci? # 3C9xx ethernet cards -#rl* at pci? # RealTek 81[23]9 ethernet -#epic* at pci? # SMC EPIC/100 ethernet -#tl* at pci? # Compaq Thunderlan ethernet cards -vr* at pci? # VIA Rhine ethernet -#wb* at pci? # Winbond W89C840F ethernet -dc* at pci? # 21143, "tulip" clone ethernet -#ti* at pci? # Alteon Tigon 1Gb ethernet -skc* at pci? # SysKonnect GEnesis 984x -sk* at skc? # each port of above -em* at pci? # Intel Pro/1000 ethernet -#txp* at pci? # 3com 3CR990 -#nge* at pci? # NS DP83820/DP83821 GigE -bge* at pci? # Broadcom BCM570x (aka Tigon3) -#stge* at pci? # Sundance TC9021 GigE -re* at pci? # Realtek 8169/8169S/8110S -#lge* at pci? # Level1 LXT1001 GigE -#hme* at pci? # Sun Happy Meal -vge* at pci? # VIA VT612x -nfe* at pci? # NVIDIA nForce Ethernet - -# Wireless network cards -#wi* at pci? # WaveLAN IEEE 802.11DS -#wi* at pcmcia? # WaveLAN IEEE 802.11DS -#an* at pcmcia? # Aironet IEEE 802.11DS -#cnw* at pcmcia? # Xircom Netwave - -# Media Independent Interface (mii) drivers -#exphy* at mii? # 3Com internal PHYs -inphy* at mii? # Intel 82555 PHYs -iophy* at mii? # Intel 82553 PHYs -icsphy* at mii? # ICS 1890 PHYs -#lxtphy* at mii? # Level1 LXT970 PHYs -nsphy* at mii? # NS and compatible PHYs +com0 at isa? port 0x3f8 irq 4 # standard PC serial ports +com1 at isa? port 0x2f8 irq 3 +com2 at isa? port 0x3e8 irq 5 + +ahc0 at isa? # Adaptec 284x SCSI controllers +ahd* at pci? # Adaptec 79?? SCSI controllers +mpi* at pci? # LSI Logic Fusion-MPT Message Passing Interface +ami* at pci? # AMI MegaRAID controllers +mfi* at pci? # LSI MegaRAID SAS controllers + +scsibus* at scsi? +sd* at scsibus? # SCSI disk drives + +fdc0 at isa? port 0x3f0 irq 6 drq 2 # standard PC floppy controllers +fd* at fdc? + +pciide* at pci? flags 0x0000 +wdc0 at isa? port 0x1f0 irq 14 flags 0x00 +wdc1 at isa? port 0x170 irq 15 flags 0x00 +wd* at wdc? flags 0x0000 +wd* at pciide? flags 0x0000 +atapiscsi* at wdc? +atapiscsi* at pciide? + +de* at pci? # DC21X4X-based ethernet cards +fxp* at pci? # EtherExpress 10/100B ethernet cards +ep* at pci? # 3C59x ethernet cards +vr* at pci? # VIA Rhine ethernet +dc* at pci? # 21143, "tulip" clone ethernet +skc* at pci? # SysKonnect GEnesis 984x +sk* at skc? # each port of above +em* at pci? # Intel Pro/1000 ethernet +bge* at pci? # Broadcom BCM570x (aka Tigon3) +re* at pci? # Realtek 8169/8169S/8110S +vge* at pci? # VIA VT612x +nfe* at pci? # NVIDIA nForce Ethernet + +inphy* at mii? # Intel 82555 PHYs +iophy* at mii? # Intel 82553 PHYs +icsphy* at mii? # ICS 1890 PHYs +nsphy* at mii? # NS and compatible PHYs nsphyter* at mii? # NS and compatible PHYs -#qsphy* at mii? # Quality Semi QS6612 PHYs -#sqphy* at mii? # Seeq 8x220 PHYs -rlphy* at mii? # RealTek 8139 internal PHYs -mtdphy* at mii? # Myson MTD972 PHYs -dcphy* at mii? # Digital Clone PHYs -amphy* at mii? # AMD 79C873 PHYs -tqphy* at mii? # TDK 78Q212x PHYs -bmtphy* at mii? # Broadcom 10/100 PHYs -rgephy* at mii? # Realtek 8169S/8110S PHY -ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY -#ipgphy* at mii? # IC Plus IP1000A PHYs -ukphy* at mii? # "unknown" PHYs - -pseudo-device loop 1 # network loopback -pseudo-device bpfilter 1 # packet filter -pseudo-device rd 1 # ramdisk -pseudo-device wsmux 2 +rlphy* at mii? # RealTek 8139 internal PHYs +mtdphy* at mii? # Myson MTD972 PHYs +dcphy* at mii? # Digital Clone PHYs +amphy* at mii? # AMD 79C873 PHYs +tqphy* at mii? # TDK 78Q212x PHYs +bmtphy* at mii? # Broadcom 10/100 PHYs +rgephy* at mii? # Realtek 8169S/8110S PHY +ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY +ukphy* at mii? # "unknown" PHYs + +pseudo-device loop 1 +pseudo-device bpfilter 1 +pseudo-device rd 1 +pseudo-device wsmux 2 diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC index 8ac55c7d8fd..86caa6b7360 100644 --- a/sys/arch/i386/conf/RAMDISKC +++ b/sys/arch/i386/conf/RAMDISKC @@ -1,30 +1,27 @@ -# $OpenBSD: RAMDISKC,v 1.111 2014/09/24 12:45:58 deraadt Exp $ +# $OpenBSD: RAMDISKC,v 1.112 2014/10/10 05:43:35 deraadt Exp $ -machine i386 # architecture, used by config; REQUIRED - -option SCSITERSE +machine i386 +maxusers 4 +option TIMEZONE=0 +option DST=0 option SMALL_KERNEL option NO_PROPOLICE - -maxusers 4 # estimated number of users -option TIMEZONE=0 # time zone to adjust RTC time by -option DST=0 # daylight saving time used by RTC - -option FFS # UFS - -option MSDOSFS # MS-DOS file system - -option INET # IP + ICMP + TCP + UDP - -option BOOT_CONFIG # boot-time kernel config +option BOOT_CONFIG option RAMDISK_HOOKS option MINIROOTSIZE=3872 -config bsd root on rd0a swap on rd0b and wd0b and sd0b +option PCIVERBOSE +option SCSITERSE + +option FFS +option MSDOSFS +option INET -mainbus0 at root +config bsd root on rd0a swap on rd0b and wd0b and sd0b + +mainbus0 at root acpi0 at bios? #acpitimer* at acpi? @@ -38,87 +35,36 @@ acpimadt0 at acpi? acpiprt* at acpi? #acpitz* at acpi? -cpu0 at mainbus? -bios0 at mainbus0 -ioapic* at mainbus? -apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 -#option APMDEBUG -pcibios0 at bios0 flags 0x0000 - -isa0 at mainbus0 -isa0 at pcib? -#isa0 at ichpcib? -#isa0 at gscpcib? -#isa0 at glxpcib? -#isa0 at amdpcib? -#eisa0 at mainbus0 -pci* at mainbus0 - -option PCIVERBOSE -#option EISAVERBOSE - -pchb* at pci? # PCI-Host bridges -ppb* at pci? # PCI-PCI bridges -pci* at ppb? -pci* at pchb? -pcib* at pci? # PCI-ISA bridge -#ichpcib* at pci? # Intel ICHx/ICHx-M LPC bridges -#amdpcib* at pci? # AMD 8111 LPC bridge -#gscpcib* at pci? # NS Geode SC1100 PCI-ISA bridge -geodesc* at pci? # Geode SC1100/SCx200 IAOC -#glxpcib* at pci? # AMD CS5536 PCI-ISA bridge - -# ISA PCMCIA controllers -#pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000 -#pcic1 at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000 -#pcic2 at isa? port 0x3e4 iomem 0xd4000 iosiz 0x4000 - -# ISA Plug-and-Play PCMCIA controllers -#pcic* at isapnp? - -# PCI PCMCIA controllers -#pcic* at pci? dev? - -# PCMCIA bus support -#pcmcia* at pcic? - -# CardBus bus support (also see NOTE below) -#cardbus* at cardslot? -#pcmcia* at cardslot? -#cbb* at pci? -#cardslot* at cbb? - -# USB Controllers -uhci* at pci? # Universal Host Controller (Intel) -ohci* at pci? # Open Host Controller - -# USB Hub Support -usb* at uhci? -usb* at ohci? - -# USB devices -uhub* at usb? # USB Hubs -uhub* at uhub? # USB Hubs -umass* at uhub? # USB Mass Storage devices -uhidev* at uhub? # Human Interface Devices -ukbd* at uhidev? # USB keyboard -wskbd* at ukbd? mux 1 -#aue* at uhub? # ADMtek AN986 Pegasus Ethernet -#atu* at uhub? # Atmel AT76c50x based 802.11b -#axe* at uhub? # ASIX Electronics AX88172 USB Ethernet -#cue* at uhub? # CATC USB-EL1201A based Ethernet -#kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet -#cdce* at uhub? # CDC Ethernet -#upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' -#ugl* at uhub? # Genesys Logic GL620USB-A host-to-host `network' -#udav* at uhub? # Davicom DM9601 based Ethernet -#url* at uhub? # Realtek RTL8150L based adapters -#wi* at uhub? # WaveLAN IEEE 802.11DS -#ural* at uhub? # Ralink RT2500 - -npx0 at isa? port 0xf0 irq 13 # math coprocessor -isadma0 at isa? -#isapnp0 at isa? +cpu0 at mainbus? +bios0 at mainbus0 +ioapic* at mainbus? +apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 +pcibios0 at bios0 flags 0x0000 + +isa0 at mainbus0 +isa0 at pcib? +pci* at mainbus0 + +pchb* at pci? # PCI-Host bridges +ppb* at pci? # PCI-PCI bridges +pci* at ppb? +pci* at pchb? +pcib* at pci? # PCI-ISA bridge + +uhci* at pci? +ohci* at pci? +usb* at uhci? +usb* at ohci? + +uhub* at usb? +uhub* at uhub? +umass* at uhub? +uhidev* at uhub? # Human Interface Devices +ukbd* at uhidev? # USB keyboard +wskbd* at ukbd? mux 1 + +npx0 at isa? port 0xf0 irq 13 # math coprocessor +isadma0 at isa? pckbc0 at isa? # PC keyboard controller pckbd* at pckbc? # PC keyboard @@ -129,61 +75,37 @@ pcdisplay0 at isa? # CGA, MDA, EGA, HGA wsdisplay* at vga? wsdisplay* at pcdisplay? -com0 at isa? port 0x3f8 irq 4 # standard PC serial ports -com1 at isa? port 0x2f8 irq 3 -com2 at isa? port 0x3e8 irq 5 - - -scsibus* at scsi? -sd* at scsibus? # SCSI disk drives -#st* at scsibus? # SCSI tape drives -#cd* at scsibus? # SCSI CD-ROM drives -#ch* at scsibus? # SCSI autochangers -#uk* at scsibus? # SCSI unknown devices - -fdc0 at isa? port 0x3f0 irq 6 drq 2 # standard PC floppy controllers -fd* at fdc? - -# IDE controllers -pciide* at pci? flags 0x0000 - -wdc0 at isa? port 0x1f0 irq 14 flags 0x00 -wdc1 at isa? port 0x170 irq 15 flags 0x00 - -# IDE hard drives -wd* at wdc? flags 0x0000 -wd* at pciide? flags 0x0000 - -# ATAPI<->SCSI -atapiscsi* at wdc? -atapiscsi* at pciide? - -em* at pci? # Intel Pro/1000 ethernet -re* at pci? # Realtek 8169/8169S/8110S -ath* at pci? # Atheros AR5k (802.11a/b/g) - -# Media Independent Interface (mii) drivers -#exphy* at mii? # 3Com internal PHYs -inphy* at mii? # Intel 82555 PHYs -iophy* at mii? # Intel 82553 PHYs -icsphy* at mii? # ICS 1890 PHYs -#lxtphy* at mii? # Level1 LXT970 PHYs -nsphy* at mii? # NS and compatible PHYs -#nsphyter* at mii? # NS and compatible PHYs -#qsphy* at mii? # Quality Semi QS6612 PHYs -#sqphy* at mii? # Seeq 8x220 PHYs -#rlphy* at mii? # RealTek 8139 internal PHYs -#mtdphy* at mii? # Myson MTD972 PHYs -#dcphy* at mii? # Digital Clone PHYs -#amphy* at mii? # AMD 79C873 PHYs -#tqphy* at mii? # TDK 78Q212x PHYs -#bmtphy* at mii? # Broadcom 10/100 PHYs -rgephy* at mii? # Realtek 8169S/8110S PHY -#ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY -#ipgphy* at mii? # IC Plus IP1000A PHYs -ukphy* at mii? # "unknown" PHYs - -pseudo-device loop 1 # network loopback -pseudo-device bpfilter 1 # packet filter -pseudo-device rd 1 # ramdisk -pseudo-device wsmux 2 +com0 at isa? port 0x3f8 irq 4 # standard PC serial ports +com1 at isa? port 0x2f8 irq 3 +com2 at isa? port 0x3e8 irq 5 + + +scsibus* at scsi? +sd* at scsibus? # SCSI disk drives + +fdc0 at isa? port 0x3f0 irq 6 drq 2 # standard PC floppy controllers +fd* at fdc? + +pciide* at pci? flags 0x0000 +wdc0 at isa? port 0x1f0 irq 14 flags 0x00 +wdc1 at isa? port 0x170 irq 15 flags 0x00 +wd* at wdc? flags 0x0000 +wd* at pciide? flags 0x0000 +atapiscsi* at wdc? +atapiscsi* at pciide? + +em* at pci? # Intel Pro/1000 ethernet +re* at pci? # Realtek 8169/8169S/8110S +ath* at pci? # Atheros AR5k (802.11a/b/g) + +inphy* at mii? # Intel 82555 PHYs +iophy* at mii? # Intel 82553 PHYs +icsphy* at mii? # ICS 1890 PHYs +nsphy* at mii? # NS and compatible PHYs +rgephy* at mii? # Realtek 8169S/8110S PHY +ukphy* at mii? # "unknown" PHYs + +pseudo-device loop 1 +pseudo-device bpfilter 1 +pseudo-device rd 1 +pseudo-device wsmux 2 diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD index d6d53c23aaf..3fb9e9b614b 100644 --- a/sys/arch/i386/conf/RAMDISK_CD +++ b/sys/arch/i386/conf/RAMDISK_CD @@ -1,40 +1,34 @@ -# $OpenBSD: RAMDISK_CD,v 1.218 2014/07/16 14:59:41 naddy Exp $ +# $OpenBSD: RAMDISK_CD,v 1.219 2014/10/10 05:43:35 deraadt Exp $ -machine i386 # architecture, used by config; REQUIRED - -option SCSITERSE +machine i386 +maxusers 4 +option TIMEZONE=0 +option DST=0 option SMALL_KERNEL option NO_PROPOLICE - -maxusers 4 # estimated number of users -option TIMEZONE=0 # time zone to adjust RTC time by -option DST=0 # daylight saving time used by RTC - -#makeoptions DEBUG="-g" # compile full symbol table - -option FFS # UFS -option FFS2 # UFS2 -option EXT2FS # Linux ext2fs - -option NFSCLIENT # Network File System client - -option CD9660 # ISO 9660 + Rock Ridge file system -option UDF # UDF (DVD) file system -option MSDOSFS # MS-DOS file system - -option INET # IP + ICMP + TCP + UDP -option INET6 # IPv6 (needs INET) - -option BOOT_CONFIG # boot-time kernel config -option CRYPTO # Cryptographic framework +option BOOT_CONFIG option RAMDISK_HOOKS option MINIROOTSIZE=3872 -config bsd root on rd0a swap on rd0b and wd0b and sd0b +option PCIVERBOSE +option SCSITERSE + +option FFS +option FFS2 +option EXT2FS +option NFSCLIENT +option CD9660 +option UDF +option MSDOSFS +option INET +option INET6 +option CRYPTO + +config bsd root on rd0a swap on rd0b and wd0b and sd0b -mainbus0 at root +mainbus0 at root acpi0 at bios? #acpitimer* at acpi? @@ -50,111 +44,73 @@ acpiprt* at acpi? mpbios0 at bios0 -cpu0 at mainbus? -bios0 at mainbus0 -ioapic* at mainbus? -apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 -#option APMDEBUG -pcibios0 at bios0 flags 0x0000 +cpu0 at mainbus? +bios0 at mainbus0 +ioapic* at mainbus? +apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 +pcibios0 at bios0 flags 0x0000 -isa0 at mainbus0 -isa0 at pcib? -#isa0 at ichpcib? -#isa0 at gscpcib? -#isa0 at glxpcib? -#isa0 at amdpcib? -eisa0 at mainbus0 -pci* at mainbus0 - -option PCIVERBOSE -#option EISAVERBOSE +isa0 at mainbus0 +isa0 at pcib? +eisa0 at mainbus0 +pci* at mainbus0 -pchb* at pci? # PCI-Host bridges -ppb* at pci? # PCI-PCI bridges -pci* at ppb? -pci* at pchb? -pcib* at pci? # PCI-ISA bridge -#ichpcib* at pci? # Intel ICHx/ICHx-M LPC bridges -#gscpcib* at pci? # NS Geode SC1100 PCI-ISA bridge -#glxpcib* at pci? # AMD CS5536 PCI-ISA bridge -#amdpcib* at pci? # AMD 8111 LPC bridge -geodesc* at pci? # Geode SC1100/SCx200 IAOC +pchb* at pci? # PCI-Host bridges +ppb* at pci? # PCI-PCI bridges +pci* at ppb? +pci* at pchb? +pcib* at pci? # PCI-ISA bridge +geodesc* at pci? # Geode SC1100/SCx200 IAOC -# CardBus bus support cardbus* at cardslot? pcmcia* at cardslot? cbb* at pci? cardslot* at cbb? - -# ISA PCMCIA controllers -pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000 -pcic1 at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000 -pcic2 at isa? port 0x3e4 iomem 0xd4000 iosiz 0x4000 - -# PCI PCMCIA controllers -pcic* at pci? - -# PCMCIA bus support -pcmcia* at pcic? - -# USB Controllers -#xhci* at pci? # eXtensible Host Controller -ehci* at pci? # Enhanced Host Controller -ehci* at cardbus? # Enhanced Host Controller -uhci* at pci? # Universal Host Controller (Intel) -ohci* at pci? # Open Host Controller -ohci* at cardbus? # Open Host Controller - -# USB bus support -#usb* at xhci? -usb* at ehci? -usb* at uhci? -usb* at ohci? - -uhub* at usb? # USB Hubs -uhub* at uhub? # USB Hubs -#uhid* at uhub? # USB Generic HID devices -#umodem* at uhub? # USB Modems/Serial -#ucom* at umodem? -#uvisor* at uhub? # Handspring Visor -#ucom* at uvisor? -#uftdi* at uhub? -#ucom* at uftdi? -#uaudio* at uhub? # USB Audio -#ulpt* at uhub? # USB Printers -uhidev* at uhub? -ukbd* at uhidev? -wskbd* at ukbd? mux 1 -umass* at uhub? # USB Mass Storage devices -#ums* at uhidev? -#wsmouse* at ums? mux 0 -aue* at uhub? # ADMtek AN986 Pegasus Ethernet -#atu* at uhub? # Atmel AT76c50x based 802.11b -axe* at uhub? # ASIX Electronics AX88172 USB Ethernet -axen* at uhub? # ASIX Electronics AX88179 USB Ethernet -cue* at uhub? # CATC USB-EL1201A based Ethernet -kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet -smsc* at uhub? # SMSC LAN95xx Ethernet -#upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' -#ugl* at uhub? # Genesys Logic GL620USB-A host-to-host `network' -#urio* at uhub? # Diamond Multimedia Rio 500 -cdce* at uhub? # CDC Ethernet -udav* at uhub? # Davicom DM9601 based Ethernet -mos* at uhub? # MOSCHIP MCS7730/7830 10/100 Ethernet -url* at uhub? # Realtek RTL8150L based adapters -wi* at uhub? # WaveLAN IEEE 802.11DS -#ugen* at uhub? # USB Generic driver -ural* at uhub? # Ralink RT2500 -rum* at uhub? # Ralink RT2501USB/RT2601USB -run* at uhub? # Ralink RT2700U/RT2800U/RT3000U -zyd* at uhub? # Zydas ZD1211/ZD1211B -upgt* at uhub? # Conexant/Intersil PrismGT SoftMAC USB -urtw* at uhub? # RealTek 8187 -urtwn* at uhub? # RealTek RTL8188CU/RTL8192CU - -npx0 at isa? port 0xf0 irq 13 # math coprocessor -isadma0 at isa? -isapnp0 at isa? +pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000 +pcic1 at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000 +pcic2 at isa? port 0x3e4 iomem 0xd4000 iosiz 0x4000 +pcic* at pci? +pcmcia* at pcic? + +#xhci* at pci? +ehci* at pci? +ehci* at cardbus? +uhci* at pci? +ohci* at pci? +ohci* at cardbus? +#usb* at xhci? +usb* at ehci? +usb* at uhci? +usb* at ohci? + +uhub* at usb? +uhub* at uhub? +uhidev* at uhub? +ukbd* at uhidev? +wskbd* at ukbd? mux 1 +umass* at uhub? +aue* at uhub? # ADMtek AN986 Pegasus Ethernet +axe* at uhub? # ASIX Electronics AX88172 USB Ethernet +axen* at uhub? # ASIX Electronics AX88179 USB Ethernet +cue* at uhub? # CATC USB-EL1201A based Ethernet +kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet +smsc* at uhub? # SMSC LAN95xx Ethernet +cdce* at uhub? # CDC Ethernet +udav* at uhub? # Davicom DM9601 based Ethernet +mos* at uhub? # MOSCHIP MCS7730/7830 10/100 Ethernet +url* at uhub? # Realtek RTL8150L based adapters +wi* at uhub? # WaveLAN IEEE 802.11DS +ural* at uhub? # Ralink RT2500 +rum* at uhub? # Ralink RT2501USB/RT2601USB +run* at uhub? # Ralink RT2700U/RT2800U/RT3000U +zyd* at uhub? # Zydas ZD1211/ZD1211B +upgt* at uhub? # Conexant/Intersil PrismGT SoftMAC USB +urtw* at uhub? # RealTek 8187 +urtwn* at uhub? # RealTek RTL8188CU/RTL8192CU + +npx0 at isa? port 0xf0 irq 13 # math coprocessor +isadma0 at isa? +isapnp0 at isa? pckbc0 at isa? # PC keyboard controller pckbd* at pckbc? # PC keyboard @@ -165,262 +121,218 @@ pcdisplay0 at isa? # CGA, MDA, EGA, HGA wsdisplay* at vga? wsdisplay* at pcdisplay? -com0 at isa? port 0x3f8 irq 4 # standard PC serial ports -com1 at isa? port 0x2f8 irq 3 -com2 at isa? port 0x3e8 irq 5 -#com3 at isa? port 0x2e8 irq 9 -#ast0 at isa? port 0x1a0 irq 5 # AST 4-port serial cards -#com* at ast? -#boca0 at isa? port 0x100 irq 5 # BOCA 8-port serial cards -#com* at boca? -#rtfps0 at isa? port 0x1230 irq 10 # RT 4-port serial cards -#com* at rtfps? -com* at pcmcia? # PCMCIA modem cards -com* at isapnp? - -# option for using CD1400 handshaking for incoming data -# requires a special cable that exchanges the RTS and DTR lines -# options CY_HW_RTS -#cy0 at isa? iomem 0xd4000 irq 12 # ISA cyclom card -#cy* at pci? # PCI cyclom card - -#lpt0 at isa? port 0x378 irq 7 # standard PC parallel ports -#lpt1 at isa? port 0x278 -#lpt2 at isa? port 0x3bc - -bha0 at isa? port 0x330 # BusLogic [57]4X SCSI controllers -#bha1 at isa? port 0x334 # BusLogic [57]4X SCSI controllers -#bha2 at isa? -bha* at pci? -#bha* at eisa? # XXX eisa still runs in isa-compat -aha0 at isa? port 0x330 # Adaptec 154[02] SCSI controllers -aha1 at isa? port 0x334 # Adaptec 154[02] SCSI controllers -aha* at isapnp? -ahb* at eisa? # Adaptec 174[024] SCSI controllers -#ahc0 at isa? # Adaptec 284x SCSI controllers -ahc* at eisa? # Adaptec 274x, aic7770 SCSI controllers -ahc* at pci? # Adaptec 2940/3940/78?? SCSI controllers -jmb* at pci? # JMicron JMB36x controllers -ahci* at jmb? -pciide* at jmb? -ahci* at pci? # AHCI SATA controllers -sili* at pci? # Silicon Image 3124/3132/3531 SATA controllers -ahd* at pci? # Adaptec 79?? SCSI controllers -arc* at pci? # Areca RAID Controllers -mpi* at pci? # LSI Logic Fusion-MPT Message Passing Interface -mpii* at pci? # LSI Fusion-MPT Message Passing Interface II -gdt* at pci? # ICP Vortex GDT RAID controllers -#aac* at pci? # Adaptec FSA RAID controllers -ami* at pci? # AMI MegaRAID controllers -mfi* at pci? # LSI MegaRAID SAS controllers -mfii* at pci? # LSI MegaRAID SAS Fusion controllers -cac* at pci? # Compaq Smart ARRAY [234]* RAID controllers -cac* at eisa? -ciss* at pci? # Compaq Smart ARRAY [56]* RAID controllers -twe* at pci? # 3ware Escalade RAID controllers -#iha* at pci? # Initio Ultra/UltraWide SCSI controllers -ips* at pci? # IBM ServeRAID controllers -qlw* at pci? # QLogic ISP SCSI -qla* at pci? # QLogic ISP 2[123]xx FibreChannel -qle* at pci? # QLogic ISP 2[45]xx FibreChannel -aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers -aic* at isapnp? -aic* at pcmcia? # PCMCIA based aic SCSI controllers -siop* at pci? # NCR 538XX SCSI controllers(new) -adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI -adw* at pci? # AdvanSys ULTRA WIDE SCSI -pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI -#sea0 at isa? iomem 0xc8000 irq 5 # Seagate ST0[12] SCSI controllers -#trm* at pci? # Tekram DC-3x5U SCSI Controllers -uha0 at isa? port 0x330 # UltraStor [13]4f SCSI controllers -#uha1 at isa? port 0x334 # UltraStor [13]4f SCSI controllers -uha* at eisa? # UltraStor 24f SCSI controllers -#wds0 at isa? port 0x350 irq 15 drq 6 # WD7000 and TMC-7000 controllers -#wds1 at isa? port 0x358 irq 11 drq 5 -vmwpvs* at pci? # VMware ParaVirtual SCSI -softraid0 at root # Software RAID - -scsibus* at scsi? -sd* at scsibus? # SCSI disk drives -st* at scsibus? # SCSI tape drives -cd* at scsibus? # SCSI CD-ROM drives -#ch* at scsibus? # SCSI autochangers -#uk* at scsibus? # SCSI unknown devices - -fdc0 at isa? port 0x3f0 irq 6 drq 2 # standard PC floppy controllers -#fdc1 at isa? port 0x370 -fd* at fdc? - -# IDE controllers -pciide* at pci? flags 0x0000 - -wdc0 at isa? port 0x1f0 irq 14 flags 0x00 -wdc1 at isa? port 0x170 irq 15 flags 0x00 -wdc* at pcmcia? -wdc* at isapnp? - -# IDE hard drives -wd* at wdc? flags 0x0000 -wd* at pciide? flags 0x0000 - -sdhc* at pci? # SD Host Controller -sdmmc* at sdhc? # SD/MMC bus -rtsx* at pci? # Realtek SD Card Reader -sdmmc* at rtsx? # SD/MMC bus - -# ATAPI<->SCSI -atapiscsi* at wdc? -atapiscsi* at pciide? - -we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC 80x3 ethernet series -we1 at isa? port 0x300 iomem 0xcc000 irq 10 # -we* at isapnp? -ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3C503 ethernet -ne0 at isa? port 0x240 irq 9 # NE[12]000 ethernet -ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet -ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet -ne* at isapnp? # NE[12]000 PnP ethernet -#eg0 at isa? port 0x310 irq 5 # 3C505/Etherlink+ ethernet -#el0 at isa? port 0x300 irq 9 # 3C501 ethernet -ep0 at isa? # 3C509 ethernet -ep* at isa? # 3C509 ethernet -ep* at isapnp? # 3C509 PnP ethernet -ef* at isapnp? # 3C515 PnP ethernet -ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN and 3C507 -#ie1 at isa? port 0x300 irq 10 # EtherExpress -le0 at isa? port 0x360 irq 15 drq 6 # IsoLan, NE2100, and DEPCA -ex0 at isa? port 0x320 irq 5 # Intel EtherExpress PRO/10 -ep* at eisa? # 3C579 ethernet -ef* at isapnp? # 3C515 ethernet -le* at isapnp? -pcn* at pci? # AMD PCnet-PCI Ethernet -de* at pci? # DC21X4X-based ethernet -fxp* at pci? # EtherExpress 10/100B ethernet -fxp* at cardbus? # Intel PRO/100 ethernet -ep* at pci? # 3C59x ethernet -ne* at pci? # NE2000-compat ethernet -ne* at pcmcia? # PCMCIA based NE2000 ethernet -ep* at pcmcia? # PCMCIA based 3C5xx ethernet -sm* at pcmcia? # PCMCIA based sm ethernet -xe* at pcmcia? # Xircom ethernet -xl* at pci? # 3C9xx ethernet -xl* at cardbus? # 3C575 ethernet -rl* at pci? # RealTek 81[23]9 ethernet -rl* at cardbus? # RealTek 81[23]9 ethernet -epic* at pci? # SMC EPIC/100 ethernet -tl* at pci? # Compaq Thunderlan ethernet -vr* at pci? # VIA Rhine ethernet -dc* at pci? # 21143, "tulip" clone ethernet -dc* at cardbus? # 21143, "tulip" clone ethernet -ste* at pci? # Sundance ST201 ethernet -sis* at pci? # SiS 900/7016 ethernet -se* at pci? # SiS 190/191 ethernet -wb* at pci? # Winbond W89C840F ethernet -sf* at pci? # Adaptec AIC-6915 ethernet -ti* at pci? # Alteon Tigon 1Gb ethernet -skc* at pci? # SysKonnect GEnesis 984x -sk* at skc? # each port of above -mskc* at pci? # Marvell Yukon-2 -msk* at mskc? # each port of above -em* at pci? # Intel Pro/1000 ethernet -gcu* at pci? # Intel EP80579 auxlliary mii device -ixgb* at pci? # Intel Pro/10Gb ethernet -ix* at pci? # Intel 82598EB 10Gb ethernet -oce* at pci? # Emulex OneConnect 10Gb ethernet -txp* at pci? # 3com 3CR990 -nge* at pci? # NS DP83820/DP83821 GigE -re* at pci? # Realtek 8169/8169S/8110S -re* at cardbus? # Realtek 8169/8169S/8110S -stge* at pci? # Sundance TC9021 GigE -bge* at pci? # Broadcom BCM57xx (aka Tigon3) -bnx* at pci? # Broadcom BCM5706/5708 GigE -lge* at pci? # Level1 LXT1001 GigE -mtd* at pci? # Myson MTD803 -hme* at pci? # Sun Happy Meal -bce* at pci? # Broadcom BCM4401 -vge* at pci? # VIA VT612x -nfe* at pci? # NVIDIA nForce Ethernet -xge* at pci? # Neterion Xframe-I/II 10Gb ethernet -vic* at pci? # VMware VMXnet virtual interface -vmx* at pci? # VMware VMXNET3 virtual interface -et* at pci? # Agere/LSI ET1310 -age* at pci? # Attansic L1 Ethernet -alc* at pci? # Attansic L1C/L1D/L2C Ethernet -ale* at pci? # Attansic L1E Ethernet -lii* at pci? # Attansic L2 Ethernet -jme* at pci? # JMicron JMC250/JMC260 Ethernet -vte* at pci? # RDC R6040 Ethernet - -# Wireless network cards -acx* at pci? # TI ACX100/ACX111 (802.11b/g) -acx* at cardbus? # TI ACX100/ACX111 (802.11b/g) -ath* at pci? # Atheros AR5k (802.11a/b/g) -ath* at cardbus? # Atheros AR5k (802.11a/b/g) -athn* at pci? # Atheros AR9k (802.11a/g/n) -athn* at cardbus? # Atheros AR9k (802.11a/g/n) -atw* at pci? # ADMtek ADM8211 (802.11) -atw* at cardbus? # ADMtek ADM8211 (802.11) -bwi* at pci? # Broadcom AirForce (802.11b/g) -bwi* at cardbus? # Broadcom AirForce (802.11b/g) -wi* at pci? # WaveLAN IEEE 802.11DS -wi* at pcmcia? # WaveLAN IEEE 802.11DS -an* at pcmcia? # Aironet IEEE 802.11DS -#cnw* at pcmcia? # Xircom Netwave -ipw* at pci? # Intel PRO/Wireless 2100 -iwi* at pci? # Intel PRO/Wireless 2200BG/2915ABG -wpi* at pci? # Intel PRO/Wireless 3945ABG -iwn* at pci? # Intel Wireless WiFi Link 4965AGN -ral* at pci? # Ralink RT2500/RT2501/RT2600 -ral* at cardbus? # Ralink RT2500/RT2501/RT2600 -rtw* at pci? # Realtek 8180 -rtw* at cardbus? # Realtek 8180 -pgt* at pci? # Prism54 (only full-mac varients) -pgt* at cardbus? # Prism54 (only full-mac varients) -malo* at cardbus? # Marvell Libertas -malo* at pcmcia? # Marvell 88W8385 - -# Media Independent Interface (mii) drivers -exphy* at mii? # 3Com internal PHYs -inphy* at mii? # Intel 82555 PHYs -iophy* at mii? # Intel 82553 PHYs -icsphy* at mii? # ICS 1890 PHYs -lxtphy* at mii? # Level1 LXT970 PHYs -nsphy* at mii? # NS and compatible PHYs -nsphyter* at mii? # NS and compatible PHYs -qsphy* at mii? # Quality Semi QS6612 PHYs -luphy* at mii? # Lucent LU6612 PHY -sqphy* at mii? # Seeq 8x220 PHYs -tlphy* at mii? # ThunderLAN PHYs -rlphy* at mii? # RealTek 8139 internal PHYs -mtdphy* at mii? # Myson MTD972 PHYs -dcphy* at mii? # Digital Clone PHYs -acphy* at mii? # Altima AC101 PHYs -amphy* at mii? # AMD 79C873 PHYs -tqphy* at mii? # TDK 78Q212x PHYs -brgphy* at mii? # Broadcom Gigabit PHYs -eephy* at mii? # Marvell 88E1000 series PHY -xmphy* at mii? # XaQti XMAC-II PHYs -bmtphy* at mii? # Broadcom 10/100 PHYs -rgephy* at mii? # Realtek 8169S/8110S PHY -urlphy* at mii? # Realtek RTL8150L internal PHY -ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY -etphy* at mii? # Agere/LSI ET1011 TruePHY -jmphy* at mii? # JMicron JMP202/JMP211 PHYs -ipgphy* at mii? # IC Plus IP1000A PHYs -atphy* at mii? # Attansic F1 PHYs -rdcphy* at mii? # RDC R6040 PHY -mlphy* at mii? # Micro Linear 6692 PHY -ukphy* at mii? # "unknown" PHYs - -pseudo-device loop 1 # network loopback -pseudo-device vlan # IEEE 802.1Q VLAN -pseudo-device bpfilter 1 # packet filter -pseudo-device rd 1 # ramdisk -pseudo-device wsmux 2 -pseudo-device bio 1 # ioctl multiplexing device - -# Virtio devices -virtio* at pci? # Virtio PCI device -vioblk* at virtio? # Virtio block device -vio* at virtio? # Virtio network device -vioscsi* at virtio? # Virtio SCSI device +com0 at isa? port 0x3f8 irq 4 # standard PC serial ports +com1 at isa? port 0x2f8 irq 3 +com2 at isa? port 0x3e8 irq 5 +com* at pcmcia? # PCMCIA modem cards +com* at isapnp? + +bha0 at isa? port 0x330 # BusLogic [57]4X SCSI controllers +bha* at pci? +aha0 at isa? port 0x330 # Adaptec 154[02] SCSI controllers +aha1 at isa? port 0x334 # Adaptec 154[02] SCSI controllers +aha* at isapnp? +ahb* at eisa? # Adaptec 174[024] SCSI controllers +ahc* at eisa? # Adaptec 274x, aic7770 SCSI controllers +ahc* at pci? # Adaptec 2940/3940/78?? SCSI controllers +jmb* at pci? # JMicron JMB36x controllers +ahci* at jmb? +pciide* at jmb? +ahci* at pci? # AHCI SATA controllers +sili* at pci? # Silicon Image 3124/3132/3531 SATA controllers +ahd* at pci? # Adaptec 79?? SCSI controllers +arc* at pci? # Areca RAID Controllers +mpi* at pci? # LSI Logic Fusion-MPT Message Passing Interface +mpii* at pci? # LSI Fusion-MPT Message Passing Interface II +gdt* at pci? # ICP Vortex GDT RAID controllers +ami* at pci? # AMI MegaRAID controllers +mfi* at pci? # LSI MegaRAID SAS controllers +mfii* at pci? # LSI MegaRAID SAS Fusion controllers +cac* at pci? # Compaq Smart ARRAY [234]* RAID controllers +cac* at eisa? +ciss* at pci? # Compaq Smart ARRAY [56]* RAID controllers +twe* at pci? # 3ware Escalade RAID controllers +ips* at pci? # IBM ServeRAID controllers +qlw* at pci? # QLogic ISP SCSI +qla* at pci? # QLogic ISP 2[123]xx FibreChannel +qle* at pci? # QLogic ISP 2[45]xx FibreChannel +aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers +aic* at isapnp? +aic* at pcmcia? # PCMCIA based aic SCSI controllers +siop* at pci? # NCR 538XX SCSI controllers(new) +adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI +adw* at pci? # AdvanSys ULTRA WIDE SCSI +pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI +uha0 at isa? port 0x330 # UltraStor [13]4f SCSI controllers +uha* at eisa? # UltraStor 24f SCSI controllers +vmwpvs* at pci? # VMware ParaVirtual SCSI +softraid0 at root + +scsibus* at scsi? +sd* at scsibus? # SCSI disk drives +st* at scsibus? # SCSI tape drives +cd* at scsibus? # SCSI CD-ROM drives + +fdc0 at isa? port 0x3f0 irq 6 drq 2 # standard PC floppy controllers +fd* at fdc? + +pciide* at pci? flags 0x0000 +wdc0 at isa? port 0x1f0 irq 14 flags 0x00 +wdc1 at isa? port 0x170 irq 15 flags 0x00 +wdc* at pcmcia? +wdc* at isapnp? +wd* at wdc? flags 0x0000 +wd* at pciide? flags 0x0000 +atapiscsi* at wdc? +atapiscsi* at pciide? + +sdhc* at pci? # SD Host Controller +sdmmc* at sdhc? # SD/MMC bus +rtsx* at pci? # Realtek SD Card Reader +sdmmc* at rtsx? # SD/MMC bus + +we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC 80x3 ethernet series +we1 at isa? port 0x300 iomem 0xcc000 irq 10 # +we* at isapnp? +ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3C503 ethernet +ne0 at isa? port 0x240 irq 9 # NE[12]000 ethernet +ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet +ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet +ne* at isapnp? # NE[12]000 PnP ethernet +ep0 at isa? # 3C509 ethernet +ep* at isa? # 3C509 ethernet +ep* at isapnp? # 3C509 PnP ethernet +ef* at isapnp? # 3C515 PnP ethernet +ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN and 3C507 +le0 at isa? port 0x360 irq 15 drq 6 # IsoLan, NE2100, and DEPCA +ex0 at isa? port 0x320 irq 5 # Intel EtherExpress PRO/10 +ep* at eisa? # 3C579 ethernet +ef* at isapnp? # 3C515 ethernet +le* at isapnp? +pcn* at pci? # AMD PCnet-PCI Ethernet +de* at pci? # DC21X4X-based ethernet +fxp* at pci? # EtherExpress 10/100B ethernet +fxp* at cardbus? # Intel PRO/100 ethernet +ep* at pci? # 3C59x ethernet +ne* at pci? # NE2000-compat ethernet +ne* at pcmcia? # PCMCIA based NE2000 ethernet +ep* at pcmcia? # PCMCIA based 3C5xx ethernet +sm* at pcmcia? # PCMCIA based sm ethernet +xe* at pcmcia? # Xircom ethernet +xl* at pci? # 3C9xx ethernet +xl* at cardbus? # 3C575 ethernet +rl* at pci? # RealTek 81[23]9 ethernet +rl* at cardbus? # RealTek 81[23]9 ethernet +epic* at pci? # SMC EPIC/100 ethernet +tl* at pci? # Compaq Thunderlan ethernet +vr* at pci? # VIA Rhine ethernet +dc* at pci? # 21143, "tulip" clone ethernet +dc* at cardbus? # 21143, "tulip" clone ethernet +ste* at pci? # Sundance ST201 ethernet +sis* at pci? # SiS 900/7016 ethernet +se* at pci? # SiS 190/191 ethernet +wb* at pci? # Winbond W89C840F ethernet +sf* at pci? # Adaptec AIC-6915 ethernet +ti* at pci? # Alteon Tigon 1Gb ethernet +skc* at pci? # SysKonnect GEnesis 984x +sk* at skc? # each port of above +mskc* at pci? # Marvell Yukon-2 +msk* at mskc? # each port of above +em* at pci? # Intel Pro/1000 ethernet +gcu* at pci? # Intel EP80579 auxlliary mii device +ixgb* at pci? # Intel Pro/10Gb ethernet +ix* at pci? # Intel 82598EB 10Gb ethernet +oce* at pci? # Emulex OneConnect 10Gb ethernet +txp* at pci? # 3com 3CR990 +nge* at pci? # NS DP83820/DP83821 GigE +re* at pci? # Realtek 8169/8169S/8110S +re* at cardbus? # Realtek 8169/8169S/8110S +stge* at pci? # Sundance TC9021 GigE +bge* at pci? # Broadcom BCM57xx (aka Tigon3) +bnx* at pci? # Broadcom BCM5706/5708 GigE +lge* at pci? # Level1 LXT1001 GigE +mtd* at pci? # Myson MTD803 +hme* at pci? # Sun Happy Meal +bce* at pci? # Broadcom BCM4401 +vge* at pci? # VIA VT612x +nfe* at pci? # NVIDIA nForce Ethernet +xge* at pci? # Neterion Xframe-I/II 10Gb ethernet +vic* at pci? # VMware VMXnet virtual interface +vmx* at pci? # VMware VMXNET3 virtual interface +et* at pci? # Agere/LSI ET1310 +age* at pci? # Attansic L1 Ethernet +alc* at pci? # Attansic L1C/L1D/L2C Ethernet +ale* at pci? # Attansic L1E Ethernet +lii* at pci? # Attansic L2 Ethernet +jme* at pci? # JMicron JMC250/JMC260 Ethernet +vte* at pci? # RDC R6040 Ethernet + +acx* at pci? # TI ACX100/ACX111 (802.11b/g) +acx* at cardbus? # TI ACX100/ACX111 (802.11b/g) +ath* at pci? # Atheros AR5k (802.11a/b/g) +ath* at cardbus? # Atheros AR5k (802.11a/b/g) +athn* at pci? # Atheros AR9k (802.11a/g/n) +athn* at cardbus? # Atheros AR9k (802.11a/g/n) +atw* at pci? # ADMtek ADM8211 (802.11) +atw* at cardbus? # ADMtek ADM8211 (802.11) +bwi* at pci? # Broadcom AirForce (802.11b/g) +bwi* at cardbus? # Broadcom AirForce (802.11b/g) +wi* at pci? # WaveLAN IEEE 802.11DS +wi* at pcmcia? # WaveLAN IEEE 802.11DS +an* at pcmcia? # Aironet IEEE 802.11DS +ipw* at pci? # Intel PRO/Wireless 2100 +iwi* at pci? # Intel PRO/Wireless 2200BG/2915ABG +wpi* at pci? # Intel PRO/Wireless 3945ABG +iwn* at pci? # Intel Wireless WiFi Link 4965AGN +ral* at pci? # Ralink RT2500/RT2501/RT2600 +ral* at cardbus? # Ralink RT2500/RT2501/RT2600 +rtw* at pci? # Realtek 8180 +rtw* at cardbus? # Realtek 8180 +pgt* at pci? # Prism54 (only full-mac varients) +pgt* at cardbus? # Prism54 (only full-mac varients) +malo* at cardbus? # Marvell Libertas +malo* at pcmcia? # Marvell 88W8385 + +exphy* at mii? # 3Com internal PHYs +inphy* at mii? # Intel 82555 PHYs +iophy* at mii? # Intel 82553 PHYs +icsphy* at mii? # ICS 1890 PHYs +lxtphy* at mii? # Level1 LXT970 PHYs +nsphy* at mii? # NS and compatible PHYs +nsphyter* at mii? # NS and compatible PHYs +qsphy* at mii? # Quality Semi QS6612 PHYs +luphy* at mii? # Lucent LU6612 PHY +sqphy* at mii? # Seeq 8x220 PHYs +tlphy* at mii? # ThunderLAN PHYs +rlphy* at mii? # RealTek 8139 internal PHYs +mtdphy* at mii? # Myson MTD972 PHYs +dcphy* at mii? # Digital Clone PHYs +acphy* at mii? # Altima AC101 PHYs +amphy* at mii? # AMD 79C873 PHYs +tqphy* at mii? # TDK 78Q212x PHYs +brgphy* at mii? # Broadcom Gigabit PHYs +eephy* at mii? # Marvell 88E1000 series PHY +xmphy* at mii? # XaQti XMAC-II PHYs +bmtphy* at mii? # Broadcom 10/100 PHYs +rgephy* at mii? # Realtek 8169S/8110S PHY +urlphy* at mii? # Realtek RTL8150L internal PHY +ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY +etphy* at mii? # Agere/LSI ET1011 TruePHY +jmphy* at mii? # JMicron JMP202/JMP211 PHYs +ipgphy* at mii? # IC Plus IP1000A PHYs +atphy* at mii? # Attansic F1 PHYs +rdcphy* at mii? # RDC R6040 PHY +mlphy* at mii? # Micro Linear 6692 PHY +ukphy* at mii? # "unknown" PHYs + +virtio* at pci? # Virtio PCI device +vioblk* at virtio? # Virtio block device +vio* at virtio? # Virtio network device +vioscsi* at virtio? # Virtio SCSI device + +pseudo-device loop 1 +pseudo-device vlan +pseudo-device bpfilter 1 +pseudo-device rd 1 +pseudo-device wsmux 2 +pseudo-device bio 1 diff --git a/sys/arch/landisk/conf/RAMDISK b/sys/arch/landisk/conf/RAMDISK index 52cc99639ba..143f6ce1445 100644 --- a/sys/arch/landisk/conf/RAMDISK +++ b/sys/arch/landisk/conf/RAMDISK @@ -1,135 +1,98 @@ -# $OpenBSD: RAMDISK,v 1.22 2014/08/22 20:03:56 deraadt Exp $ -# -# For further information on compiling OpenBSD kernels, see the config(8) -# man page. -# -# For further information on hardware support for this architecture, see -# the intro(4) man page. For further information about kernel options -# for this architecture, see the options(4) man page. For an explanation -# of each device driver in this file see the section 4 man page for the -# device. +# $OpenBSD: RAMDISK,v 1.23 2014/10/10 05:43:35 deraadt Exp $ machine landisk sh -maxusers 32 # estimated number of users +maxusers 4 -option SH4 # processor family; MANDATORY -option SH7751R # processor type; MANDATORY +option TIMEZONE=0 +option DST=0 +option SMALL_KERNEL +option NO_PROPOLICE +option BOOT_CONFIG -# CPU-related options. -option PCLOCK=33333333 # 33.33MHz clock -option DONT_INIT_BSC -#option DONT_INIT_PCIBSC +option MINIROOTSIZE=5120 +option RAMDISK_HOOKS option PCIVERBOSE option USBVERBOSE -option DST=0 # daylight saving time used by RTC -option FFS # UFS -option CD9660 # ISO 9660 + Rock Ridge file system -option MSDOSFS # MS-DOS file system -option INET # IP + ICMP + TCP + UDP -option INET6 # IPv6 (needs INET) -option DDB # kernel debugger -option EXT2FS # Second Extended Filesystem +option FFS +option CD9660 +option MSDOSFS +option EXT2FS +option INET +option INET6 -config bsd root on rd0a swap on rd0b +config bsd root on rd0a swap on rd0b -mainbus0 at root -cpu0 at mainbus? +option SH4 # processor family; MANDATORY +option SH7751R # processor type; MANDATORY +option PCLOCK=33333333 # 33.33MHz clock +option DONT_INIT_BSC +#option DONT_INIT_PCIBSC -# PCI bus support -shpcic* at mainbus? # SH7751 PCIC -pci0 at shpcic? +mainbus0 at root +cpu0 at mainbus? -# SH bus -shb* at mainbus? +shpcic* at mainbus? +pci0 at shpcic? +shb* at mainbus? +obio0 at mainbus? -# on-board I/O bus -obio0 at mainbus? +option SCIFCONSOLE +option SCIFCN_SPEED=9600 +scif0 at shb? -# Serial Devices -option SCIFCONSOLE -option SCIFCN_SPEED=9600 -scif0 at shb? +rsclock0 at shb? -rsclock0 at shb? +wdc0 at obio? port 0x14000000 irq 10 +wd* at wdc? flags 0x0000 -wdc0 at obio? port 0x14000000 irq 10 # CF -wd* at wdc? flags 0x0000 +re* at pci? # Realtek 8139C+/8169/8169S/8110S +rl* at pci? # Realtek 8129/8139 -# Network Interfaces +acphy* at mii? # Altima AC101 PHYs +amphy* at mii? # AMD 79C873 PHYs +eephy* at mii? # Marvell 88E1000 series PHY +rgephy* at mii? # Realtek 8169S/8110S PHY +rlphy* at mii? # Realtek 8139/8201L PHYs +urlphy* at mii? # Realtek RTL8150L internal PHYs +ukphy* at mii? # generic unknown PHYs -# PCI network interfaces -re* at pci? # Realtek 8139C+/8169/8169S/8110S -rl* at pci? # Realtek 8129/8139 - -# MII/PHY support -acphy* at mii? # Altima AC101 PHYs -amphy* at mii? # AMD 79C873 PHYs -eephy* at mii? # Marvell 88E1000 series PHY -rgephy* at mii? # Realtek 8169S/8110S PHY -rlphy* at mii? # Realtek 8139/8201L PHYs -urlphy* at mii? # Realtek RTL8150L internal PHYs -ukphy* at mii? # generic unknown PHYs - -# PCIIDE pciide* at pci? wd* at pciide? atapiscsi* at pciide? flags 0x0000 -# USB Controller and Devices - -# PCI USB controllers -ehci* at pci? # Enhanced Host Controller -ohci* at pci? # Open Host Controller - -# USB bus support -usb* at ehci? -usb* at ohci? - -# USB Hubs -uhub* at usb? -uhub* at uhub? port ? configuration ? interface ? -umass* at uhub? # USB Mass Storage devices -aue* at uhub? # ADMtek AN986 Pegasus Ethernet -atu* at uhub? # Atmel AT76c50x based 802.11b -axe* at uhub? # ASIX Electronics AX88172 USB Ethernet -axen* at uhub? # ASIX Electronics AX88179 USB Ethernet -cue* at uhub? # CATC USB-EL1201A based Ethernet -kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet -smsc* at uhub? # SMSC LAN95xx Ethernet -cdce* at uhub? # CDC Ethernet -upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' -ugl* at uhub? # Genesys Logic GL620USB-A host-to-host `network' -udav* at uhub? # Davicom DM9601 based Ethernet -url* at uhub? # Realtek RTL8150L based adapters -wi* at uhub? # WaveLAN IEEE 802.11DS -#urio* at uhub? # Diamond Multimedia Rio 500 -ugen* at uhub? # USB Generic driver -#uath* at uhub? # Atheros AR5005UG/AR5005UX -ural* at uhub? # Ralink RT2500USB -rum* at uhub? # Ralink RT2501USB/RT2601USB -zyd* at uhub? # Zydas ZD1211 -#udcf* at uhub? # Gude Expert mouseCLOCK -#uow* at uhub? # Maxim/Dallas DS2490 1-Wire adapter -#onewire* at uow? - -scsibus* at scsi? -sd* at scsibus? # SCSI disk drives -cd* at scsibus? # SCSI CD-ROM drives - -# mouse & keyboard multiplexor pseudo-devices -pseudo-device wsmux 2 -#pseudo-device bio 1 # ioctl multiplexing device -#pseudo-device hotplug 1 # devices hot plugging - -option BOOT_CONFIG # boot-time kernel config - -pseudo-device loop 1 # network loopback -pseudo-device bpfilter 1 # packet filter -pseudo-device rd 1 # ram disk - -# RAMDISK stuff -option MINIROOTSIZE=5120 -option RAMDISK_HOOKS - +ehci* at pci? +ohci* at pci? +usb* at ehci? +usb* at ohci? + +uhub* at usb? +uhub* at uhub? +umass* at uhub? +aue* at uhub? # ADMtek AN986 Pegasus Ethernet +atu* at uhub? # Atmel AT76c50x based 802.11b +axe* at uhub? # ASIX Electronics AX88172 USB Ethernet +axen* at uhub? # ASIX Electronics AX88179 USB Ethernet +cue* at uhub? # CATC USB-EL1201A based Ethernet +kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet +smsc* at uhub? # SMSC LAN95xx Ethernet +cdce* at uhub? # CDC Ethernet +upl* at uhub? # Prolific PL2301/PL2302 host-to-host +ugl* at uhub? # Genesys Logic GL620USB-A host-to-host +udav* at uhub? # Davicom DM9601 based Ethernet +url* at uhub? # Realtek RTL8150L based adapters +wi* at uhub? # WaveLAN IEEE 802.11DS +ugen* at uhub? # USB Generic driver +ural* at uhub? # Ralink RT2500USB +rum* at uhub? # Ralink RT2501USB/RT2601USB +zyd* at uhub? # Zydas ZD1211 + +scsibus* at scsi? +sd* at scsibus? +cd* at scsibus? + +pseudo-device wsmux 2 +pseudo-device loop 1 +pseudo-device bpfilter 1 +pseudo-device rd 1 diff --git a/sys/arch/loongson/conf/RAMDISK b/sys/arch/loongson/conf/RAMDISK index c1c0265d792..96d986b98c2 100644 --- a/sys/arch/loongson/conf/RAMDISK +++ b/sys/arch/loongson/conf/RAMDISK @@ -1,53 +1,42 @@ -# $OpenBSD: RAMDISK,v 1.22 2014/04/07 08:27:24 brad Exp $ -# -# For further information on compiling OpenBSD kernels, see the config(8) -# man page. -# -# For further information on hardware support for this architecture, see -# the intro(4) man page. For further information about kernel options -# for this architecture, see the options(4) man page. For an explanation -# of each device driver in this file see the section 4 man page for the -# device. +# $OpenBSD: RAMDISK,v 1.23 2014/10/10 05:43:35 deraadt Exp $ machine loongson mips64 +maxusers 4 -maxusers 8 +option TIMEZONE=0 +option DST=0 +option SMALL_KERNEL +option NO_PROPOLICE +option BOOT_CONFIG -option CPU_LOONGSON2 -makeoption LINK_ADDRESS="0xffffffff80200000" +option MINIROOTSIZE=8192 +option RAMDISK_HOOKS option PCIVERBOSE option USBVERBOSE -# Filesystem options -option FFS # UFS -option FFS2 # UFS2 -option NFSCLIENT # Network File System client -option CD9660 # ISO 9660 + Rock Ridge file system -option UDF # UDF (DVD) file system -option EXT2FS # Second Extended Filesystem -option MSDOSFS # MS-DOS file system -option INET # IP + ICMP + TCP + UDP -option INET6 # IPv6 (needs INET) -option DDB # kernel debugger +option FFS +option FFS2 +option NFSCLIENT +option CD9660 +option UDF +option EXT2FS +option MSDOSFS +option INET +option INET6 -option MINIROOTSIZE=8192 -option RAMDISK_HOOKS +option CPU_LOONGSON2 +makeoption LINK_ADDRESS="0xffffffff80200000" -config bsd root on rd0a swap on rd0b +config bsd root on rd0a swap on rd0b -# -# Definition of system -# mainbus0 at root cpu0 at mainbus0 clock0 at mainbus0 -# Main local buses bonito* at mainbus0 pci* at bonito? -# Lemote Lynloong, Lemote Fuloong 2F and Lemote Yeeloong devices glxpcib* at pci? isa0 at glxpcib? mcclock0 at isa? port 0x70 @@ -63,7 +52,6 @@ wsdisplay* at sisfb? smfb* at pci? # Yeeloong only wsdisplay* at smfb? -# Gdium Liberty specific devices voyager* at pci? gpio0 at voyager? gdiumiic0 at gpio0 offset 6 mask 0x81 # pins 6 and 13 @@ -74,87 +62,75 @@ ohci* at voyager? smfb* at voyager? wsdisplay* at smfb? -# Generic 2E systems (in addition to the Fuloong devices) pcib* at pci? isa0 at pcib? vga* at pci? wsdisplay* at vga? -# USB Controllers ohci* at pci? uhci* at pci? ehci* at pci? - -# USB bus support usb* at ohci? usb* at uhci? usb* at ehci? -# USB devices -uhub* at usb? # USB Hubs -uhub* at uhub? # USB Hubs -umodem* at uhub? # USB Modems/Serial +uhub* at usb? +uhub* at uhub? +umodem* at uhub? # USB Modems/Serial ucom* at umodem? -uvscom* at uhub? # SUNTAC Slipper U VS-10U serial +uvscom* at uhub? # SUNTAC Slipper U VS-10U serial ucom* at uvscom? -ubsa* at uhub? # Belkin serial adapter +ubsa* at uhub? # Belkin serial adapter ucom* at ubsa? -uplcom* at uhub? # I/O DATA USB-RSAQ2 serial adapter +uplcom* at uhub? # I/O DATA USB-RSAQ2 serial adapter ucom* at uplcom? -umass* at uhub? # USB Mass Storage devices -uhidev* at uhub? # Human Interface Devices -ukbd* at uhidev? # USB keyboard +umass* at uhub? +uhidev* at uhub? # Human Interface Devices +ukbd* at uhidev? # USB keyboard wskbd* at ukbd? mux 1 -uhid* at uhidev? # USB generic HID support -atu* at uhub? # Atmel AT76c50x based 802.11b -aue* at uhub? # ADMtek AN986 Pegasus Ethernet -axe* at uhub? # ASIX Electronics AX88172 USB Ethernet -axen* at uhub? # ASIX Electronics AX88179 USB Ethernet -cdce* at uhub? # CDC Ethernet -cue* at uhub? # CATC USB-EL1201A based Ethernet -kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet -mos* at uhub? # MOSCHIP MCS7730/7830 10/100 Ethernet -smsc* at uhub? # SMSC LAN95xx Ethernet -otus* at uhub? # Atheros AR9001U -rum* at uhub? # Ralink RT2501USB/RT2601USB -run* at uhub? # Ralink RT2700U/RT2800U/RT3000U -uath* at uhub? # Atheros AR5005UG/AR5005UX -udav* at uhub? # Davicom DM9601 based Ethernet -upgt* at uhub? # Conexant/Intersil PrismGT SoftMAC USB -upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' -ugl* at uhub? # Genesys Logic GL620USB-A host-to-host `network' -ural* at uhub? # Ralink RT2500USB -url* at uhub? # Realtek RTL8150L based adapters -urtw* at uhub? # RealTek 8187 -wi* at uhub? # WaveLAN IEEE 802.11DS -zyd* at uhub? # Zydas ZD1211 -ugen* at uhub? # USB Generic driver - -# NICs +uhid* at uhidev? # USB generic HID support +atu* at uhub? # Atmel AT76c50x based 802.11b +aue* at uhub? # ADMtek AN986 Pegasus Ethernet +axe* at uhub? # ASIX Electronics AX88172 USB Ethernet +axen* at uhub? # ASIX Electronics AX88179 USB Ethernet +cdce* at uhub? # CDC Ethernet +cue* at uhub? # CATC USB-EL1201A based Ethernet +kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet +mos* at uhub? # MOSCHIP MCS7730/7830 10/100 Ethernet +smsc* at uhub? # SMSC LAN95xx Ethernet +otus* at uhub? # Atheros AR9001U +rum* at uhub? # Ralink RT2501USB/RT2601USB +run* at uhub? # Ralink RT2700U/RT2800U/RT3000U +uath* at uhub? # Atheros AR5005UG/AR5005UX +udav* at uhub? # Davicom DM9601 based Ethernet +upgt* at uhub? # Conexant/Intersil PrismGT SoftMAC USB +upl* at uhub? # Prolific PL2301/PL2302 host-to-host +ugl* at uhub? # Genesys Logic GL620USB-A host-to-host +ural* at uhub? # Ralink RT2500USB +url* at uhub? # Realtek RTL8150L based adapters +urtw* at uhub? # RealTek 8187 +wi* at uhub? # WaveLAN IEEE 802.11DS +zyd* at uhub? # Zydas ZD1211 +ugen* at uhub? # USB Generic driver + ral* at pci? re* at pci? rl* at pci? -# Media Independent Interface (mii) drivers -acphy* at mii? # Altima AC101 PHYs -amphy* at mii? # AMD 79C873 PHYs -bmtphy* at mii? # Broadcom 10/100 PHYs -eephy* at mii? # Marvell 88E1000 series PHY -rgephy* at mii? # Realtek 8169S/8110S PHY -rlphy* at mii? # RealTek 8139 internal PHYs -urlphy* at mii? # Realtek RTL8150L internal PHY -ukphy* at mii? # "unknown" PHYs +acphy* at mii? # Altima AC101 PHYs +amphy* at mii? # AMD 79C873 PHYs +bmtphy* at mii? # Broadcom 10/100 PHYs +eephy* at mii? # Marvell 88E1000 series PHY +rgephy* at mii? # Realtek 8169S/8110S PHY +rlphy* at mii? # RealTek 8139 internal PHYs +urlphy* at mii? # Realtek RTL8150L internal PHY +ukphy* at mii? # "unknown" PHYs scsibus* at scsi? sd* at scsibus? -#st* at scsibus? cd* at scsibus? -#ch* at scsibus? -#uk* at scsibus? - -pseudo-device loop 1 # network loopback -pseudo-device bpfilter 1 # packet filter -pseudo-device rd 1 # ram disk -pseudo-device wsmux 2 # mouse & keyboard multiplexor -option BOOT_CONFIG # boot-time kernel config +pseudo-device loop 1 +pseudo-device bpfilter 1 +pseudo-device rd 1 +pseudo-device wsmux 2 diff --git a/sys/arch/luna88k/conf/RAMDISK b/sys/arch/luna88k/conf/RAMDISK index 09c422ae875..5903f0d6786 100644 --- a/sys/arch/luna88k/conf/RAMDISK +++ b/sys/arch/luna88k/conf/RAMDISK @@ -1,39 +1,28 @@ -# $OpenBSD: RAMDISK,v 1.11 2011/11/08 19:22:13 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.12 2014/10/10 05:43:35 deraadt Exp $ machine luna88k m88k +maxusers 4 + +option TIMEZONE=0 +option DST=0 +option SMALL_KERNEL +option NO_PROPOLICE +option BOOT_CONFIG -# 4 meg ramdisk option MINIROOTSIZE=4096 option RAMDISK_HOOKS -# Processor type -option M88100 # 88100 support; mandatory - -# Number of maximum processors -option MAX_CPUS=4 # may have up to 4 processors - -# Define this if your processor has the xxx.usr bug (mask C82N) -option ERRATA__XXX_USR - -maxusers 32 - -config bsd root rd0a swap on rd0b - option SCSITERSE -option SMALL_KERNEL -option NO_PROPOLICE -option TIMEZONE=0 -option DST=0 + option FFS -option NFSCLIENT -option CD9660 option INET option INET6 -option BOOT_CONFIG -# -# devices -# +config bsd root rd0a swap on rd0b + +option M88100 # 88100 support; mandatory +option MAX_CPUS=4 # may have up to 4 processors +option ERRATA__XXX_USR mainbus0 at root clock0 at mainbus0 @@ -45,19 +34,14 @@ fb0 at mainbus0 spc0 at mainbus0 spc1 at mainbus0 -# Workstation Console attachments wsdisplay* at fb? wskbd* at ws? -wsmouse* at ws? - -# SCSI bus support -# SCSI devices scsibus* at scsi? sd* at scsibus? # SCSI disks st* at scsibus? # SCSI tapes cd* at scsibus? # SCSI CD-ROM -pseudo-device loop 1 +pseudo-device loop 1 pseudo-device bpfilter 1 -pseudo-device rd 1 +pseudo-device rd 1 diff --git a/sys/arch/macppc/conf/RAMDISK b/sys/arch/macppc/conf/RAMDISK index 930c0a06ffb..ec20c23ec59 100644 --- a/sys/arch/macppc/conf/RAMDISK +++ b/sys/arch/macppc/conf/RAMDISK @@ -1,144 +1,128 @@ -# $OpenBSD: RAMDISK,v 1.106 2014/09/14 18:59:18 brad Exp $ -# -# PPC GENERIC config file -# +# $OpenBSD: RAMDISK,v 1.107 2014/10/10 05:43:35 deraadt Exp $ machine macppc powerpc +maxusers 4 -maxusers 32 +option TIMEZONE=0 +option DST=0 +option SMALL_KERNEL +option NO_PROPOLICE +option BOOT_CONFIG + +option MINIROOTSIZE=8192 +option RAMDISK_HOOKS option PCIVERBOSE -# include "../../../conf/GENERIC" -option TIMEZONE=0 # time zone to adjust RTC time by -option DST=0 # daylight saving time used by RTC -option COMPAT_43 # and 4.3BSD -option FFS # UFS -option FFS2 # UFS2 -option NFSCLIENT # Network File System client -option CD9660 # ISO 9660 + Rock Ridge file system -option UDF # UDF (DVD) file system -option MSDOSFS # MS-DOS file system -option INET # IP + ICMP + TCP + UDP -option INET6 # IPv6 (needs INET) -option DDB # kernel debugger -option CRYPTO # Cryptographic framework - -config bsd root on rd0a swap on rd0b +option FFS +option FFS2 +option NFSCLIENT +option CD9660 +option UDF +option MSDOSFS +option INET +option INET6 +option CRYPTO + +config bsd root on rd0a swap on rd0b mainbus0 at root softraid0 at root cpu0 at mainbus0 -mpcpcibr* at mainbus0 # MPC106 PCI Bridge. +mpcpcibr* at mainbus0 # MPC106 PCI Bridge. memc* at mainbus0 -openpic* at memc? # openpic interrupt controller -kiic* at memc? # Keywest I2C -pchb* at pci? # host bridge identifiers +openpic* at memc? # openpic interrupt controller +pchb* at pci? # host bridge identifiers ht* at mainbus0 smu* at mainbus0 -#### PCI Bus devices. - pci* at mpcpcibr? pci* at ht? -ppb* at pci? # PCI-PCI bridges +ppb* at pci? # PCI-PCI bridges pci* at ppb? +macobio0 at pci? +macintr0 at macobio? # old interrupt controller +openpic* at macobio? # openpic interrupt controller + siop* at pci? fxp* at pci? de* at pci? -#vme* at pci? -vgafb0 at pci? # PCI VGA graphics -#ep* at pci? # 3Com 3c59x -#ne* at pci? # NE2000-compatible Ethernet -#adv* at pci? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI -ahc* at pci? # Adaptec 294x, aic78x0 SCSI -#bha* at pci? # BusLogic 9xx SCSI -pcscp* at pci? # AMD Am53c974 PCscsi-PCI SCSI -qlw* at pci? # QLogic ISP SCSI -qla* at pci? # QLogic ISP 2[123]xx FibreChannel -qle* at pci? # QLogic ISP 2[45]xx FibreChannel -mpi* at pci? # LSI Logic MPT-Fusion Message Passing Interface -arc* at pci? # Areca RAID Controllers +vgafb0 at pci? # PCI VGA graphics +ahc* at pci? # Adaptec 294x, aic78x0 SCSI +pcscp* at pci? # AMD Am53c974 PCscsi-PCI SCSI +qlw* at pci? # QLogic ISP SCSI +qla* at pci? # QLogic ISP 2[123]xx FibreChannel +qle* at pci? # QLogic ISP 2[45]xx FibreChannel +mpi* at pci? # LSI Logic MPT-Fusion Message Passing Interface +arc* at pci? # Areca RAID Controllers pciide* at pci? -kauaiata* at pci? # Apple ATA 100 +kauaiata* at pci? # Apple ATA 100 wdc* at kauaiata? -macobio0 at pci? -gem* at pci? # GMAC ethernet -hme* at pci? # HME ethernet -vge* at pci? # VIA VT612x -dc* at pci? # DEC Tulip 21143 clones -xl* at pci? # 3C9xx ethernet -em* at pci? # Intel Pro/1000 ethernet -#ixgb* at pci? # Intel Pro/10Gb ethernet -epic* at pci? # SMC EPIC/100 ethernet -bge* at pci? # Broadcom BCM570x (aka Tigon3) -ti* at pci? # Alteon Tigon 1Gb ethernet -re* at pci? # Realtek 8169/8169S/8110S -rl* at pci? # Realtek 81[23]9 ethernet -stge* at pci? # Sundance TC9021 GigE -skc* at pci? # SysKonnect GEnesis 984x -sk* at skc? # each port of above -mskc* at pci? # Marvell Yukon-2 -msk* at mskc? # each port of above -an* at pci? # Cisco/Aironet 802.11DS -ath* at pci? # Atheros AR5k (802.11a/b/g) -wi* at pci? # WaveLAN IEEE 802.11DS -vr* at pci? # VIA Rhine ethernet -pcn* at pci? # AMD PCnet-PCI Ethernet -xge* at pci? # Neterion Xframe-I/II 10Gb ethernet -ral* at pci? # Ralink RT2500/RT2501/RT2600 - -# how many of these are needed? -amphy* at mii? # AMD 79C873 PHYs -dcphy* at mii? # Digital Clone PHYs -acphy* at mii? # Altima AC101 PHYs -exphy* at mii? # 3Com internal PHYs -inphy* at mii? # Intel 82555 PHYs -iophy* at mii? # Intel 82553 PHYs -icsphy* at mii? # Integrated Circuit Systems ICS1890 -lxtphy* at mii? # Level One LXT-970 PHYs -nsphy* at mii? # NS83840 PHYs -#nsphyter* at mii? # NS83843 PHYs -mtdphy* at mii? # Myson MTD972 PHYs -qsphy* at mii? # Quality Semiconductor QS6612 PHYs -luphy* at mii? # Lucent LU6612 PHY -sqphy* at mii? # Seeq 80220/80221/80223 PHYs -rlphy* at mii? # RealTek 8139 internal PHYs -#tlphy* at mii? # ThunderLAN PHYs -tqphy* at mii? # TDK Semiconductor PHYs -brgphy* at mii? # Broadcom 10/100/1000 PHYs -bmtphy* at mii? # Broadcom 10/100 PHYs -eephy* at mii? # Marvell 88E1000 Gigabit PHYs -xmphy* at mii? # XaQti XMAC-II PHYs -urlphy* at mii? # Realtek RTL8150L internal PHY -rgephy* at mii? # Realtek 8169S/8110S PHY -rlphy* at mii? # Realtek 8139 internal PHYs -ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY -ipgphy* at mii? # IC Plus IP1000A PHYs -ukphy* at mii? # generic unknown PHYs - -macintr0 at macobio? # old interrupt controller -openpic* at macobio? # openpic interrupt controller -bm* at macobio? # bmac ethernet -mc* at macobio? # MACE ethernet -#esp* at macobio? flags 0x0000ffff# 53c9x SCSI + +gem* at pci? # GMAC ethernet +hme* at pci? # HME ethernet +vge* at pci? # VIA VT612x +dc* at pci? # DEC Tulip 21143 clones +xl* at pci? # 3C9xx ethernet +em* at pci? # Intel Pro/1000 ethernet +epic* at pci? # SMC EPIC/100 ethernet +bge* at pci? # Broadcom BCM570x (aka Tigon3) +ti* at pci? # Alteon Tigon 1Gb ethernet +re* at pci? # Realtek 8169/8169S/8110S +rl* at pci? # Realtek 81[23]9 ethernet +stge* at pci? # Sundance TC9021 GigE +skc* at pci? # SysKonnect GEnesis 984x +sk* at skc? # each port of above +mskc* at pci? # Marvell Yukon-2 +msk* at mskc? # each port of above +an* at pci? # Cisco/Aironet 802.11DS +ath* at pci? # Atheros AR5k (802.11a/b/g) +wi* at pci? # WaveLAN IEEE 802.11DS +vr* at pci? # VIA Rhine ethernet +pcn* at pci? # AMD PCnet-PCI Ethernet +xge* at pci? # Neterion Xframe-I/II 10Gb ethernet +ral* at pci? # Ralink RT2500/RT2501/RT2600 + +amphy* at mii? # AMD 79C873 PHYs +dcphy* at mii? # Digital Clone PHYs +acphy* at mii? # Altima AC101 PHYs +exphy* at mii? # 3Com internal PHYs +inphy* at mii? # Intel 82555 PHYs +iophy* at mii? # Intel 82553 PHYs +icsphy* at mii? # Integrated Circuit Systems ICS1890 +lxtphy* at mii? # Level One LXT-970 PHYs +nsphy* at mii? # NS83840 PHYs +mtdphy* at mii? # Myson MTD972 PHYs +qsphy* at mii? # Quality Semiconductor QS6612 PHYs +luphy* at mii? # Lucent LU6612 PHY +sqphy* at mii? # Seeq 80220/80221/80223 PHYs +rlphy* at mii? # RealTek 8139 internal PHYs +tqphy* at mii? # TDK Semiconductor PHYs +brgphy* at mii? # Broadcom 10/100/1000 PHYs +bmtphy* at mii? # Broadcom 10/100 PHYs +eephy* at mii? # Marvell 88E1000 Gigabit PHYs +xmphy* at mii? # XaQti XMAC-II PHYs +urlphy* at mii? # Realtek RTL8150L internal PHY +rgephy* at mii? # Realtek 8169S/8110S PHY +rlphy* at mii? # Realtek 8139 internal PHYs +ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY +ipgphy* at mii? # IC Plus IP1000A PHYs +ukphy* at mii? # generic unknown PHYs + +bm* at macobio? # bmac ethernet +mc* at macobio? # MACE ethernet mesh* at macobio? flags 0xffff# MESH SCSI -#nvram* at macobio? # nvram -adb* at macobio? # Apple Desktop Bus -wi* at macobio? # Apple Airport 802.11DS -macgpio* at macobio? # GPIO, PMU interrupt router. -macgpio* at macgpio? # GPIO, PMU interrupt router. -akbd* at adb? # ADB keyboard +adb* at macobio? # Apple Desktop Bus +wi* at macobio? # Apple Airport 802.11DS +macgpio* at macobio? # GPIO, PMU interrupt router. +macgpio* at macgpio? # GPIO, PMU interrupt router. +akbd* at adb? # ADB keyboard wskbd* at akbd? mux 1 -#ams* at adb? # ADB mouse -#wsmouse* at ams? mux 0 -#abtn* at adb? # ADB button? zsc* at macobio? zstty* at zsc? - mediabay* at macobio? wdc* at mediabay? wdc* at macobio? @@ -147,14 +131,12 @@ wd* at pciide? atapiscsi* at wdc? flags 0x0000 atapiscsi* at pciide? flags 0x0000 -# USB Controllers -ohci* at pci? # Open Host Controller -ohci* at cardbus? # Open Host Controller -uhci* at pci? # Universal Host Controller -ehci* at pci? # Enhanced Host Controller -ehci* at cardbus? # Enhanced Host Controller +ohci* at pci? +ohci* at cardbus? +uhci* at pci? +ehci* at pci? +ehci* at cardbus? -# USB bus support usb* at ohci? usb* at uhci? usb* at ehci? @@ -164,9 +146,6 @@ uhub* at uhub? uhidev* at uhub? uhid* at uhidev? # USB Generic HID devices ukbd* at uhidev? # USB HID Keyboard devices -#ums* at uhub? # USB Mice -#wsmouse* at ums? mux 0 -#ulpt* at uhub? # USB Printer aue* at uhub? # ADMtek AN986 Pegasus Ethernet axe* at uhub? # ASIX Electronics AX88172 USB Ethernet axen* at uhub? # ASIX Electronics AX88179 USB Ethernet @@ -175,7 +154,7 @@ kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet smsc* at uhub? # SMSC LAN95xx Ethernet cdce* at uhub? # CDC Ethernet upl* at uhub? # Prolific PL2301/PL2302 host-to-host -ugl* at uhub? # Genesys Logic GL620A-USB host-to-host +ugl* at uhub? # Genesys Logic GL620USB-A host-to-host udav* at uhub? # Davicom DM9601 based Ethernet mos* at uhub? # MOSCHIP MCS7730/7830 10/100 Ethernet ural* at uhub? # Ralink RT2500 @@ -184,30 +163,8 @@ urtwn* at uhub? # Realtek RTL8188CU/RTL8192CU zyd* at uhub? # Zydas ZD1211 url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS -#ugen* at uhub? # USB Generic driver -umass* at uhub? # USB Mass Storage devices - -# I2C bus support -iic* at kiic? -#iic* at piic? -#iic* at smu? - -# I2C devices -#lmtemp* at iic? -#lmenv* at iic? -#maxtmp* at iic? -#adc* at iic? -#tsl* at iic? -#admtmp* at iic? -#pcagpio* at iic? -#gpio* at pcagpio? -#maxds* at iic? -fcu* at iic? -#adt* at iic? -#asms* at iic? -#spdmem* at mem? - -# CardBus bus support +umass* at uhub? + cardbus* at cardslot? pcmcia* at cardslot? cbb* at pci? @@ -229,18 +186,10 @@ scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? -#ch* at scsibus? -#uk* at scsibus? - -pseudo-device loop 1 # network loopback -pseudo-device bpfilter 1 # packet filter -pseudo-device vlan # IEEE 802.1Q VLAN -pseudo-device rd 1 # ram disk -pseudo-device wsmux 2 # mouse & keyboard multiplexor -pseudo-device bio 1 # ioctl multiplexing device -option BOOT_CONFIG # boot-time kernel config - -# RAMDISK stuff -option MINIROOTSIZE=8192 -option RAMDISK_HOOKS +pseudo-device loop 1 +pseudo-device bpfilter 1 +pseudo-device vlan +pseudo-device rd 1 +pseudo-device wsmux 2 +pseudo-device bio 1 diff --git a/sys/arch/octeon/conf/RAMDISK b/sys/arch/octeon/conf/RAMDISK index 341ba167fb9..2f8ad66db51 100644 --- a/sys/arch/octeon/conf/RAMDISK +++ b/sys/arch/octeon/conf/RAMDISK @@ -1,87 +1,65 @@ -# $OpenBSD: RAMDISK,v 1.14 2014/07/12 22:03:16 brad Exp $ -# -# For further information on compiling OpenBSD kernels, see the config(8) -# man page. -# -# For further information on hardware support for this architecture, see -# the intro(4) man page. For further information about kernel options -# for this architecture, see the options(4) man page. For an explanation -# of each device driver in this file see the section 4 man page for the -# device. +# $OpenBSD: RAMDISK,v 1.15 2014/10/10 05:43:35 deraadt Exp $ machine octeon mips64 -maxusers 8 +maxusers 4 -option CPU_OCTEON -option FPUEMUL -makeoption LINK_ADDRESS="0xffffffff81000000" +option TIMEZONE=0 +option DST=0 +option SMALL_KERNEL +option NO_PROPOLICE +option BOOT_CONFIG + +option RAMDISK_HOOKS +option MINIROOTSIZE=10240 option PCIVERBOSE option USBVERBOSE -# Filesystem options -option FFS # UFS -option FFS2 # UFS2 -#option NFSCLIENT # Network File System client -option CD9660 # ISO 9660 + Rock Ridge file system -option UDF # UDF (DVD) file system -option EXT2FS # Second Extended Filesystem -option MSDOSFS # MS-DOS file system -option INET # IP + ICMP + TCP + UDP -option INET6 # IPv6 (needs INET) -option DDB # kernel debugger +option FFS +option FFS2 +option CD9660 +option UDF +option EXT2FS +option MSDOSFS +option INET +option INET6 -option MINIROOTSIZE=10240 -option RAMDISK_HOOKS +option CPU_OCTEON +option FPUEMUL +makeoption LINK_ADDRESS="0xffffffff81000000" -config bsd root on rd0a swap on rd0b +config bsd root on rd0a swap on rd0b -# -# Definition of system -# mainbus0 at root cpu0 at mainbus0 clock0 at mainbus0 iobus0 at mainbus0 -uartbus0 at mainbus0 - octcf0 at iobus0 - +uartbus0 at mainbus0 com0 at uartbus0 com1 at uartbus0 pcibus* at iobus0 pci* at pcibus? - -ppb* at pci? # PCI-PCI bridges +ppb* at pci? pci* at ppb? -# IDE Controller -pciide* at pci? flags 0x0000 +cn30xxgmx* at iobus? +cnmac* at cn30xxgmx? -# IDE hard drives +pciide* at pci? flags 0x0000 wd* at pciide? flags 0x0000 -# USB Controllers -#octhci* at iobus0 - -# USB bus support +#octhci* at iobus0 #usb* at octhci? - -# USB devices -#uhub* at usb? # USB Hubs - -cn30xxgmx* at iobus? -cnmac* at cn30xxgmx? +#uhub* at usb? rgephy* at mii? ukphy* at mii? atphy* at mii? brswphy* at mii? -pseudo-device loop 1 # network loopback -pseudo-device bpfilter 1 # packet filter -pseudo-device rd 1 # ram disk -pseudo-device wsmux 2 # mouse & keyboard multiplexor - -option BOOT_CONFIG # boot-time kernel config +pseudo-device loop 1 +pseudo-device bpfilter 1 +pseudo-device rd 1 +pseudo-device wsmux 2 diff --git a/sys/arch/sgi/conf/RAMDISK-IP22 b/sys/arch/sgi/conf/RAMDISK-IP22 index d93c5c40aed..20966534254 100644 --- a/sys/arch/sgi/conf/RAMDISK-IP22 +++ b/sys/arch/sgi/conf/RAMDISK-IP22 @@ -1,61 +1,49 @@ -# $OpenBSD: RAMDISK-IP22,v 1.12 2012/07/18 19:56:02 miod Exp $ +# $OpenBSD: RAMDISK-IP22,v 1.13 2014/10/10 05:43:35 deraadt Exp $ # # THIS KERNEL IS FOR INDIGO (IP20), INDY (IP22) AND INDIGO2 (IP24) SYSTEMS ONLY. machine sgi mips64 - maxusers 4 -option TIMEZONE=0 # minutes west of GMT (for) -option DST=0 # use daylight savings rules -# Make options -makeoption LINK_ADDRESS="0xffffffff88800000" -# Force use of 16KB pages. The R5000 Indy, which has the infamous XKPHYS -# coherency bug wrt ll/sc instructions, can not have more than 256MB of -# physical memory, all of it fitting within CKSEG0. -option PAGE_SHIFT="14" +option TIMEZONE=0 +option DST=0 +option SMALL_KERNEL +option NO_PROPOLICE +option BOOT_CONFIG -option DDB +option MINIROOTSIZE=10240 +option RAMDISK_HOOKS option EISAVERBOSE option PCIVERBOSE -# Filesystem options -option CD9660 # ISO 9660 + Rock Ridge file system -option FIFO # POSIX fifo support (in all filesystems) -option FFS # fast filesystem -#option MSDOSFS # Ability to read write MS-Dos filesystem -option NFSCLIENT # Sun NFS-compatible filesystem (client) - -# Networking options -option INET # IP + ICMP + TCP + UDP -option INET6 # IPv6 (needs INET) +option FFS +option CD9660 +option NFSCLIENT +option INET +option INET6 -# RAMDISK stuff -option MINIROOTSIZE=10240 -option RAMDISK_HOOKS - -# Define what targets to support -option TGT_INDIGO # R4x00 Indigo (IP20) -option TGT_INDIGO2 # Indigo2, Challenge M (IP22) -option TGT_INDY # Indy, Challenge S (IP24) -option ARCBIOS # mandatory -option CPU_R4000 # R4000/R4400 support (IP20/IP22/IP24) -option CPU_R4600 # R4600 support (IP22/IP24) -option CPU_R5000 # R5000 support (IP24) +makeoption LINK_ADDRESS="0xffffffff88800000" +# Force use of 16KB pages. The R5000 Indy, which has the infamous XKPHYS +# coherency bug wrt ll/sc instructions, can not have more than 256MB of +# physical memory, all of it fitting within CKSEG0. +option PAGE_SHIFT="14" +option TGT_INDIGO # R4x00 Indigo (IP20) +option TGT_INDIGO2 # Indigo2, Challenge M (IP22) +option TGT_INDY # Indy, Challenge S (IP24) +option ARCBIOS # mandatory +option CPU_R4000 # R4000/R4400 support (IP20/IP22/IP24) +option CPU_R4600 # R4600 support (IP22/IP24) +option CPU_R5000 # R5000 support (IP24) -# Specify storage configuration using ramdisk -config bsd root on rd0a swap on rd0b +config bsd root on rd0a swap on rd0b -# -# Definition of system -# mainbus0 at root cpu* at mainbus0 -clock0 at mainbus0 # scheduling clock on Indy +clock0 at mainbus0 # scheduling clock on Indy -int0 at mainbus0 # Interrupt Controller and scheduling clock -imc0 at mainbus0 # Memory Controller +int0 at mainbus0 # Interrupt Controller and scheduling clock +imc0 at mainbus0 # Memory Controller gio0 at imc0 eisa0 at imc0 @@ -63,32 +51,28 @@ hpc0 at gio? addr 0x1fb80000 hpc1 at gio? addr 0x1fb00000 hpc2 at gio? addr 0x1f980000 -dpclock0 at hpc0 # IP20 -dsclock0 at hpc0 # IP22/24 -sq* at hpc? # On-board Ethernet or E++ adapter -wdsc* at hpc? # On-board SCSI or GIO32 SCSI adapter -pckbc* at hpc0 # Indy/Indigo2 keyboard and mouse +dpclock0 at hpc0 # IP20 +dsclock0 at hpc0 # IP22/24 +sq* at hpc? # On-board Ethernet or E++ adapter +wdsc* at hpc? # On-board SCSI or GIO32 SCSI adapter +pckbc* at hpc0 # Indy/Indigo2 keyboard and mouse zs0 at hpc0 zs1 at hpc0 -zstty* at zs0 # Serial ports +zstty* at zs0 # Serial ports zskbd* at zs1 channel 0 wskbd* at zskbd? mux 1 -#zsms* at zs1 channel 1 -#wsmouse* at zsms? mux 0 pckbd* at pckbc? wskbd* at pckbd? mux 1 -#pms* at pckbc? -#wsmouse* at pms? mux 0 -grtwo* at gio? # Express (GR2/GR3) graphics +grtwo* at gio? # Express (GR2/GR3) graphics wsdisplay* at grtwo? -impact* at gio? # Impact graphics +impact* at gio? # Impact graphics wsdisplay* at impact? -light* at gio? # Light/Starter/Entry (LG1/LG2) graphics +light* at gio? # Light/Starter/Entry (LG1/LG2) graphics wsdisplay* at light? -newport* at gio? # Indy Newport and Indigo2 XL graphics +newport* at gio? # Indy Newport and Indigo2 XL graphics wsdisplay* at newport? giopci* at gio? @@ -98,14 +82,8 @@ scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? -#ch* at scsibus? -#uk* at scsibus? - -#### PSEUDO Devices -pseudo-device loop 1 # network loopback -pseudo-device bpfilter 1 # packet filter ports - -pseudo-device rd 1 # Ram disk. -pseudo-device bio 1 # ioctl multiplexing device -option BOOT_CONFIG # add support for boot -c +pseudo-device loop 1 +pseudo-device bpfilter 1 +pseudo-device rd 1 +pseudo-device bio 1 diff --git a/sys/arch/sgi/conf/RAMDISK-IP26 b/sys/arch/sgi/conf/RAMDISK-IP26 index 9fe61dddd63..8ebcada2d68 100644 --- a/sys/arch/sgi/conf/RAMDISK-IP26 +++ b/sys/arch/sgi/conf/RAMDISK-IP26 @@ -1,76 +1,60 @@ -# $OpenBSD: RAMDISK-IP26,v 1.1 2012/09/29 21:46:02 miod Exp $ +# $OpenBSD: RAMDISK-IP26,v 1.2 2014/10/10 05:43:35 deraadt Exp $ # # THIS KERNEL IS FOR POWER INDIGO2 R8000 (IP26) SYSTEMS ONLY. machine sgi mips64 - maxusers 4 -option TIMEZONE=0 # minutes west of GMT (for) -option DST=0 # use daylight savings rules -# Make options -makeoption LINK_ADDRESS="0xa800000008010000" +option TIMEZONE=0 +option DST=0 +option SMALL_KERNEL +option NO_PROPOLICE +option BOOT_CONFIG -option DDB +option MINIROOTSIZE=10240 +option RAMDISK_HOOKS option EISAVERBOSE option PCIVERBOSE -# Filesystem options -option CD9660 # ISO 9660 + Rock Ridge file system -option FIFO # POSIX fifo support (in all filesystems) -option FFS # fast filesystem -#option MSDOSFS # Ability to read write MS-Dos filesystem -option NFSCLIENT # Sun NFS-compatible filesystem (client) +option FFS +option CD9660 +option NFSCLIENT +option INET +option INET6 -# Networking options -option INET # IP + ICMP + TCP + UDP -option INET6 # IPv6 (needs INET) - -# RAMDISK stuff -option MINIROOTSIZE=10240 -option RAMDISK_HOOKS - -# Define what targets to support -option TGT_INDIGO2 # Indigo2 -option ARCBIOS # mandatory -option CPU_R8000 # R8000 support +makeoption LINK_ADDRESS="0xa800000008010000" +option TGT_INDIGO2 # Indigo2 +option ARCBIOS # mandatory +option CPU_R8000 # R8000 support -# Specify storage configuration using ramdisk -config bsd root on rd0a swap on rd0b +config bsd root on rd0a swap on rd0b -# -# Definition of system -# mainbus0 at root cpu* at mainbus0 -tcc0 at mainbus0 # Streaming Cache Controller -int0 at mainbus0 # Interrupt Controller and scheduling clock -imc0 at mainbus0 # Memory Controller +tcc0 at mainbus0 # Streaming Cache Controller +int0 at mainbus0 # Interrupt Controller and scheduling clock +imc0 at mainbus0 # Memory Controller gio0 at imc0 eisa0 at imc0 hpc0 at gio? addr 0x1fb80000 -dsclock0 at hpc0 -sq* at hpc? # On-board Ethernet -wdsc* at hpc? # On-board SCSI -pckbc* at hpc0 # keyboard and mouse +dsclock0 at hpc0 +sq* at hpc? # On-board Ethernet +wdsc* at hpc? # On-board SCSI +pckbc* at hpc0 # keyboard and mouse zs0 at hpc0 -zstty* at zs0 # Serial ports +zstty* at zs0 # Serial ports pckbd* at pckbc? wskbd* at pckbd? mux 1 -#pms* at pckbc? -#wsmouse* at pms? mux 0 -grtwo* at gio? # Express (GR2/GR3) graphics +grtwo* at gio? # Express (GR2/GR3) graphics wsdisplay* at grtwo? -#impact* at gio? # Impact graphics -#wsdisplay* at impact? -newport* at gio? # XL graphics +newport* at gio? # XL graphics wsdisplay* at newport? giopci* at gio? @@ -80,14 +64,8 @@ scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? -#ch* at scsibus? -#uk* at scsibus? - -#### PSEUDO Devices -pseudo-device loop 1 # network loopback -pseudo-device bpfilter 1 # packet filter ports - -pseudo-device rd 1 # Ram disk. -pseudo-device bio 1 # ioctl multiplexing device -option BOOT_CONFIG # add support for boot -c +pseudo-device loop 1 +pseudo-device bpfilter 1 +pseudo-device rd 1 +pseudo-device bio 1 diff --git a/sys/arch/sgi/conf/RAMDISK-IP27 b/sys/arch/sgi/conf/RAMDISK-IP27 index 035e2749c12..377ab9be1e5 100644 --- a/sys/arch/sgi/conf/RAMDISK-IP27 +++ b/sys/arch/sgi/conf/RAMDISK-IP27 @@ -1,57 +1,43 @@ -# $OpenBSD: RAMDISK-IP27,v 1.34 2014/09/14 18:59:18 brad Exp $ +# $OpenBSD: RAMDISK-IP27,v 1.35 2014/10/10 05:43:35 deraadt Exp $ # # THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY. machine sgi mips64 - maxusers 4 -option TIMEZONE=0 # minutes west of GMT (for) -option DST=0 # use daylight savings rules -# Make options -makeoption LINK_ADDRESS="0xa800000000040000" +option TIMEZONE=0 +option DST=0 +option SMALL_KERNEL +option NO_PROPOLICE +option BOOT_CONFIG + +option MINIROOTSIZE=10240 +option RAMDISK_HOOKS option PCIVERBOSE option USBVERBOSE +option ONEWIREVERBOSE -option DDB - -# Filesystem options -option CD9660 # ISO 9660 + Rock Ridge file system -option FIFO # POSIX fifo support (in all filesystems) -option FFS # fast filesystem -#option MSDOSFS # Ability to read write MS-Dos filesystem -option NFSCLIENT # Sun NFS-compatible filesystem (client) - -# Networking options -option INET # IP + ICMP + TCP + UDP -option INET6 # IPv6 (needs INET) - -# RAMDISK stuff -option MINIROOTSIZE=10240 -option RAMDISK_HOOKS +option FFS +option CD9660 +option NFSCLIENT +option INET +option INET6 -# Define what targets to support -option TGT_ORIGIN # IP27/IP35 +makeoption LINK_ADDRESS="0xa800000000040000" +option TGT_ORIGIN # IP27/IP35 option TGT_COHERENT -option ARCBIOS -option CPU_R10000 # R10000/R12000/R14000/R16000 support +option ARCBIOS +option CPU_R10000 # R10000/R12000/R14000/R16000 support option MIPS_PTE64 -# Specify storage configuration using ramdisk -config bsd root on rd0a swap on rd0b +config bsd root on rd0a swap on rd0b -# -# Definition of system -# mainbus0 at root cpu* at mainbus0 clock0 at mainbus0 -#### Main local buses xbow* at mainbus0 - -# XBow devices xbridge* at xbow? xbpci* at xbridge? pci* at xbpci? @@ -60,7 +46,6 @@ wsdisplay* at impact? odyssey* at xbow? wsdisplay* at odyssey? -# IOC3 ioc* at pci? com0 at ioc? base 0x00020178 com1 at ioc? base 0x00020170 @@ -69,11 +54,9 @@ iec* at ioc? iockbc* at ioc? onewire* at ioc? -option ONEWIREVERBOSE owmac* at onewire? owserial* at onewire? -# IOC4 iof* at pci? com0 at iof? base 0x380 com1 at iof? base 0x388 @@ -83,7 +66,6 @@ com* at iof? dsrtc0 at iof? iockbc* at iof? -#### SCSI controllers ahc* at pci? qlw* at pci? qla* at pci? @@ -91,138 +73,118 @@ qle* at pci? mpi* at pci? siop* at pci? -# USB Controllers -ohci* at pci? # Open Host Controller -uhci* at pci? # Universal Host Controller -ehci* at pci? # Enhanced Host Controller - -# USB bus support +ohci* at pci? +uhci* at pci? +ehci* at pci? usb* at ohci? usb* at uhci? usb* at ehci? -# USB devices -uhub* at usb? # USB Hubs -uhub* at uhub? # USB Hubs -umodem* at uhub? # USB Modems/Serial +uhub* at usb? +uhub* at uhub? +umodem* at uhub? # USB Modems/Serial ucom* at umodem? -uvscom* at uhub? # SUNTAC Slipper U VS-10U serial +uvscom* at uhub? # SUNTAC Slipper U VS-10U serial ucom* at uvscom? -ubsa* at uhub? # Belkin serial adapter +ubsa* at uhub? # Belkin serial adapter ucom* at ubsa? -#ulpt* at uhub? # USB Printers -umass* at uhub? # USB Mass Storage devices -uhidev* at uhub? # Human Interface Devices -ums* at uhidev? # USB mouse -wsmouse* at ums? mux 0 -ukbd* at uhidev? # USB keyboard +umass* at uhub? +uhidev* at uhub? # Human Interface Devices +ukbd* at uhidev? # USB keyboard wskbd* at ukbd? mux 1 -uhid* at uhidev? # USB generic HID support -atu* at uhub? # Atmel AT76c50x based 802.11b -aue* at uhub? # ADMtek AN986 Pegasus Ethernet -axe* at uhub? # ASIX Electronics AX88172 USB Ethernet -axen* at uhub? # ASIX Electronics AX88179 USB Ethernet -cdce* at uhub? # CDC Ethernet -cue* at uhub? # CATC USB-EL1201A based Ethernet -kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet -mos* at uhub? # MOSCHIP MCS7730/7830 10/100 Ethernet -otus* at uhub? # Atheros AR9001U -rum* at uhub? # Ralink RT2501USB/RT2601USB -run* at uhub? # Ralink RT2700U/RT2800U/RT3000U -smsc* at uhub? # SMSC LAN95xx Ethernet -uath* at uhub? # Atheros AR5005UG/AR5005UX -udav* at uhub? # Davicom DM9601 based Ethernet -upgt* at uhub? # Conexant/Intersil PrismGT SoftMAC USB -upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' -ugl* at uhub? # Genesys Logic GL620USB-A host-to-host `network' -ural* at uhub? # Ralink RT2500USB -url* at uhub? # Realtek RTL8150L based adapters -urtw* at uhub? # RealTek 8187 -wi* at uhub? # WaveLAN IEEE 802.11DS -zyd* at uhub? # Zydas ZD1211 -ugen* at uhub? # USB Generic driver - -ppb* at pci? # PCI-PCI bridges +uhid* at uhidev? # USB generic HID support +atu* at uhub? # Atmel AT76c50x based 802.11b +aue* at uhub? # ADMtek AN986 Pegasus Ethernet +axe* at uhub? # ASIX Electronics AX88172 USB Ethernet +axen* at uhub? # ASIX Electronics AX88179 USB Ethernet +cdce* at uhub? # CDC Ethernet +cue* at uhub? # CATC USB-EL1201A based Ethernet +kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet +mos* at uhub? # MOSCHIP MCS7730/7830 10/100 Ethernet +otus* at uhub? # Atheros AR9001U +rum* at uhub? # Ralink RT2501USB/RT2601USB +run* at uhub? # Ralink RT2700U/RT2800U/RT3000U +smsc* at uhub? # SMSC LAN95xx Ethernet +uath* at uhub? # Atheros AR5005UG/AR5005UX +udav* at uhub? # Davicom DM9601 based Ethernet +upgt* at uhub? # Conexant/Intersil PrismGT SoftMAC USB +upl* at uhub? # Prolific PL2301/PL2302 host-to-host +ugl* at uhub? # Genesys Logic GL620USB-A host-to-host +ural* at uhub? # Ralink RT2500USB +url* at uhub? # Realtek RTL8150L based adapters +urtw* at uhub? # RealTek 8187 +wi* at uhub? # WaveLAN IEEE 802.11DS +zyd* at uhub? # Zydas ZD1211 +ugen* at uhub? # USB Generic driver + +ppb* at pci? # PCI-PCI bridges pci* at ppb? -#### NICs -pcn* at pci? # AMD PCnet-PCI Ethernet -epic* at pci? # SMC EPIC/100 ethernet -de* at pci? # DC21X4X-based ethernet -dc* at pci? # 21143, "tulip" clone ethernet -sf* at pci? # Adaptec AIC-6915 ethernet -em* at pci? # Intel Pro/1000 ethernet -ep* at pci? # 3Com 3c59x -fxp* at pci? # EtherExpress 10/100B ethernet -mtd* at pci? # Myson MTD803 3-in-1 Ethernet -ne* at pci? # NE2000-compatible Ethernet -ti* at pci? # Alteon ACEnic gigabit Ethernet -stge* at pci? # Sundance TC9021 GigE -vr* at pci? # VIA Rhine Fast Ethernet -xl* at pci? # 3C9xx ethernet -re* at pci? # Realtek 8169/8169S/8110S -rl* at pci? # Realtek 81[23]9 ethernet -hme* at pci? # Sun Happy Meal -gem* at pci? # Sun 'gem' ethernet -cas* at pci? # Sun Cassini 100/Gigabit -skc* at pci? # SysKonnect GEnesis 984x -sk* at skc? # each port of above -mskc* at pci? # Marvell Yukon-2 -msk* at mskc? # each port of above -bge* at pci? # Broadcom BCM570x (aka Tigon3) -vge* at pci? # VIA VT612x -bnx* at pci? # Broadcom BCM5706/5708 GigE -sis* at pci? # SiS 900/7016 ethernet - -##### Media Independent Interface (mii) drivers -exphy* at mii? # 3Com internal PHYs -inphy* at mii? # Intel 82555 PHYs -iophy* at mii? # Intel 82553 PHYs -icsphy* at mii? # ICS 1890 PHYs -lxtphy* at mii? # Level1 LXT970 PHYs -nsphy* at mii? # NS and compatible PHYs -nsphyter* at mii? # NS and compatible PHYs -qsphy* at mii? # Quality Semi QS6612 PHYs -sqphy* at mii? # Seeq 8x220 PHYs -luphy* at mii? # Lucent LU6612 PHY -rlphy* at mii? # RealTek 8139 internal PHYs -mtdphy* at mii? # Myson MTD972 PHYs -dcphy* at mii? # Digital Clone PHYs -acphy* at mii? # Altima AC101 PHYs -amphy* at mii? # AMD 79C873 PHYs -tqphy* at mii? # TDK 78Q212x PHYs -bmtphy* at mii? # Broadcom 10/100 PHYs -brgphy* at mii? # Broadcom Gigabit PHYs -ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY -eephy* at mii? # Marvell 88E1000 series PHY -xmphy* at mii? # XaQti XMAC-II PHYs -nsgphy* at mii? # NS gigabit PHYs -urlphy* at mii? # Realtek RTL8150L internal PHY -rgephy* at mii? # Realtek 8169S/8110S PHY -ipgphy* at mii? # IC Plus IP1000A PHYs -gentbi* at mii? # Generic 1000BASE-X ten-bit PHY -ukphy* at mii? # "unknown" PHYs - -#### Keyboard and Mouse +pcn* at pci? # AMD PCnet-PCI Ethernet +epic* at pci? # SMC EPIC/100 ethernet +de* at pci? # DC21X4X-based ethernet +dc* at pci? # 21143, "tulip" clone ethernet +sf* at pci? # Adaptec AIC-6915 ethernet +em* at pci? # Intel Pro/1000 ethernet +ep* at pci? # 3Com 3c59x +fxp* at pci? # EtherExpress 10/100B ethernet +mtd* at pci? # Myson MTD803 3-in-1 Ethernet +ne* at pci? # NE2000-compatible Ethernet +ti* at pci? # Alteon ACEnic gigabit Ethernet +stge* at pci? # Sundance TC9021 GigE +vr* at pci? # VIA Rhine Fast Ethernet +xl* at pci? # 3C9xx ethernet +re* at pci? # Realtek 8169/8169S/8110S +rl* at pci? # Realtek 81[23]9 ethernet +hme* at pci? # Sun Happy Meal +gem* at pci? # Sun 'gem' ethernet +cas* at pci? # Sun Cassini 100/Gigabit +skc* at pci? # SysKonnect GEnesis 984x +sk* at skc? # each port of above +mskc* at pci? # Marvell Yukon-2 +msk* at mskc? # each port of above +bge* at pci? # Broadcom BCM570x (aka Tigon3) +vge* at pci? # VIA VT612x +bnx* at pci? # Broadcom BCM5706/5708 GigE +sis* at pci? # SiS 900/7016 ethernet + +exphy* at mii? # 3Com internal PHYs +inphy* at mii? # Intel 82555 PHYs +iophy* at mii? # Intel 82553 PHYs +icsphy* at mii? # ICS 1890 PHYs +lxtphy* at mii? # Level1 LXT970 PHYs +nsphy* at mii? # NS and compatible PHYs +nsphyter* at mii? # NS and compatible PHYs +qsphy* at mii? # Quality Semi QS6612 PHYs +sqphy* at mii? # Seeq 8x220 PHYs +luphy* at mii? # Lucent LU6612 PHY +rlphy* at mii? # RealTek 8139 internal PHYs +mtdphy* at mii? # Myson MTD972 PHYs +dcphy* at mii? # Digital Clone PHYs +acphy* at mii? # Altima AC101 PHYs +amphy* at mii? # AMD 79C873 PHYs +tqphy* at mii? # TDK 78Q212x PHYs +bmtphy* at mii? # Broadcom 10/100 PHYs +brgphy* at mii? # Broadcom Gigabit PHYs +ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY +eephy* at mii? # Marvell 88E1000 series PHY +xmphy* at mii? # XaQti XMAC-II PHYs +nsgphy* at mii? # NS gigabit PHYs +urlphy* at mii? # Realtek RTL8150L internal PHY +rgephy* at mii? # Realtek 8169S/8110S PHY +ipgphy* at mii? # IC Plus IP1000A PHYs +gentbi* at mii? # Generic 1000BASE-X ten-bit PHY +ukphy* at mii? # "unknown" PHYs + pckbd* at iockbc? -pms* at iockbc? wskbd* at pckbd? mux 1 -wsmouse* at pms? mux 0 - -#### SCSI Bus devices scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? -#ch* at scsibus? -#uk* at scsibus? - -#### PSEUDO Devices -pseudo-device loop 1 # network loopback -pseudo-device bpfilter 1 # packet filter ports - -pseudo-device rd 1 # Ram disk. -pseudo-device bio 1 # ioctl multiplexing device -option BOOT_CONFIG # add support for boot -c +pseudo-device loop 1 +pseudo-device bpfilter 1 +pseudo-device rd 1 +pseudo-device bio 1 diff --git a/sys/arch/sgi/conf/RAMDISK-IP28 b/sys/arch/sgi/conf/RAMDISK-IP28 index a1c6b0a42be..f7dfbef4c87 100644 --- a/sys/arch/sgi/conf/RAMDISK-IP28 +++ b/sys/arch/sgi/conf/RAMDISK-IP28 @@ -1,75 +1,61 @@ -# $OpenBSD: RAMDISK-IP28,v 1.3 2012/07/14 19:53:27 miod Exp $ +# $OpenBSD: RAMDISK-IP28,v 1.4 2014/10/10 05:43:35 deraadt Exp $ # # THIS KERNEL IS FOR POWER INDIGO2 R10000 (IP28) SYSTEMS ONLY. machine sgi mips64 - maxusers 4 -option TIMEZONE=0 # minutes west of GMT (for) -option DST=0 # use daylight savings rules -# Make options -makeoption LINK_ADDRESS="0xa800000020020000" +option TIMEZONE=0 +option DST=0 +option SMALL_KERNEL +option NO_PROPOLICE +option BOOT_CONFIG -option DDB +option MINIROOTSIZE=10240 +option RAMDISK_HOOKS -option EISAVERBOSE option PCIVERBOSE +option EISAVERBOSE -# Filesystem options -option CD9660 # ISO 9660 + Rock Ridge file system -option FIFO # POSIX fifo support (in all filesystems) -option FFS # fast filesystem -#option MSDOSFS # Ability to read write MS-Dos filesystem -option NFSCLIENT # Sun NFS-compatible filesystem (client) - -# Networking options -option INET # IP + ICMP + TCP + UDP -option INET6 # IPv6 (needs INET) +option FFS +option CD9660 +option NFSCLIENT +option INET +option INET6 -# RAMDISK stuff -option MINIROOTSIZE=10240 -option RAMDISK_HOOKS - -# Define what targets to support -option TGT_INDIGO2 # Indigo2 -option ARCBIOS # mandatory -option CPU_R10000 # R10000 support +makeoption LINK_ADDRESS="0xa800000020020000" +option TGT_INDIGO2 # Indigo2 +option ARCBIOS # mandatory +option CPU_R10000 # R10000 support -# Specify storage configuration using ramdisk -config bsd root on rd0a swap on rd0b +config bsd root on rd0a swap on rd0b -# -# Definition of system -# mainbus0 at root cpu* at mainbus0 -int0 at mainbus0 # Interrupt Controller and scheduling clock -imc0 at mainbus0 # Memory Controller +int0 at mainbus0 # Interrupt Controller and scheduling clock +imc0 at mainbus0 # Memory Controller gio0 at imc0 eisa0 at imc0 hpc0 at gio? addr 0x1fb80000 -dsclock0 at hpc0 -sq* at hpc? # On-board Ethernet -wdsc* at hpc? # On-board SCSI -pckbc* at hpc0 # keyboard and mouse +dsclock0 at hpc0 +sq* at hpc? # On-board Ethernet +wdsc* at hpc? # On-board SCSI +pckbc* at hpc0 # keyboard and mouse zs0 at hpc0 -zstty* at zs0 # Serial ports +zstty* at zs0 # Serial ports pckbd* at pckbc? wskbd* at pckbd? mux 1 -#pms* at pckbc? -#wsmouse* at pms? mux 0 -grtwo* at gio? # Express (GR2/GR3) graphics +grtwo* at gio? # Express (GR2/GR3) graphics wsdisplay* at grtwo? -impact* at gio? # Impact graphics +impact* at gio? # Impact graphics wsdisplay* at impact? -newport* at gio? # XL graphics +newport* at gio? # XL graphics wsdisplay* at newport? giopci* at gio? @@ -79,14 +65,8 @@ scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? -#ch* at scsibus? -#uk* at scsibus? - -#### PSEUDO Devices -pseudo-device loop 1 # network loopback -pseudo-device bpfilter 1 # packet filter ports - -pseudo-device rd 1 # Ram disk. -pseudo-device bio 1 # ioctl multiplexing device -option BOOT_CONFIG # add support for boot -c +pseudo-device loop 1 +pseudo-device bpfilter 1 +pseudo-device rd 1 +pseudo-device bio 1 diff --git a/sys/arch/sgi/conf/RAMDISK-IP30 b/sys/arch/sgi/conf/RAMDISK-IP30 index 9e72157dee1..7888a5a6e22 100644 --- a/sys/arch/sgi/conf/RAMDISK-IP30 +++ b/sys/arch/sgi/conf/RAMDISK-IP30 @@ -1,56 +1,42 @@ -# $OpenBSD: RAMDISK-IP30,v 1.29 2014/09/14 18:59:18 brad Exp $ +# $OpenBSD: RAMDISK-IP30,v 1.30 2014/10/10 05:43:35 deraadt Exp $ # # THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY. machine sgi mips64 - maxusers 4 -option TIMEZONE=0 # minutes west of GMT (for) -option DST=0 # use daylight savings rules -# Make options -makeoption LINK_ADDRESS="0xa800000020020000" +option TIMEZONE=0 +option DST=0 +option SMALL_KERNEL +option NO_PROPOLICE +option BOOT_CONFIG + +option MINIROOTSIZE=10240 +option RAMDISK_HOOKS option PCIVERBOSE option USBVERBOSE +option ONEWIREVERBOSE -option DDB +option FFS +option CD9660 +option NFSCLIENT +option INET +option INET6 -# Filesystem options -option CD9660 # ISO 9660 + Rock Ridge file system -option FIFO # POSIX fifo support (in all filesystems) -option FFS # fast filesystem -#option MSDOSFS # Ability to read write MS-Dos filesystem -option NFSCLIENT # Sun NFS-compatible filesystem (client) - -# Networking options -option INET # IP + ICMP + TCP + UDP -option INET6 # IPv6 (needs INET) - -# RAMDISK stuff -option MINIROOTSIZE=10240 -option RAMDISK_HOOKS +makeoption LINK_ADDRESS="0xa800000020020000" -# Define what targets to support -option TGT_OCTANE # Octane, Octane 2 +option TGT_OCTANE # Octane, Octane 2 option TGT_COHERENT option ARCBIOS -option CPU_R10000 # R10000/R12000/R14000/R16000 support +option CPU_R10000 # R10000/R12000/R14000/R16000 support -# Specify storage configuration using ramdisk -config bsd root on rd0a swap on rd0b +config bsd root on rd0a swap on rd0b -# -# Definition of system -# mainbus0 at root cpu* at mainbus0 clock0 at mainbus0 - -#### Main local buses xbow0 at mainbus0 - -# XBow devices xheart* at xbow? onewire* at xheart? xbridge* at xbow? @@ -61,7 +47,6 @@ wsdisplay* at impact? odyssey* at xbow? wsdisplay* at odyssey? -# IOC3 ioc* at pci? com0 at ioc? base 0x00020178 com1 at ioc? base 0x00020170 @@ -71,11 +56,9 @@ iec* at ioc? iockbc* at ioc? onewire* at ioc? -option ONEWIREVERBOSE owmac* at onewire? owserial* at onewire? -#### SCSI controllers ahc* at pci? qlw* at pci? qla* at pci? @@ -83,138 +66,118 @@ qle* at pci? mpi* at pci? siop* at pci? -# USB Controllers -ohci* at pci? # Open Host Controller -uhci* at pci? # Universal Host Controller -ehci* at pci? # Enhanced Host Controller - -# USB bus support +ohci* at pci? +uhci* at pci? +ehci* at pci? usb* at ohci? usb* at uhci? usb* at ehci? -# USB devices -uhub* at usb? # USB Hubs -uhub* at uhub? # USB Hubs -umodem* at uhub? # USB Modems/Serial +uhub* at usb? +uhub* at uhub? +umodem* at uhub? # USB Modems/Serial ucom* at umodem? -uvscom* at uhub? # SUNTAC Slipper U VS-10U serial +uvscom* at uhub? # SUNTAC Slipper U VS-10U serial ucom* at uvscom? -ubsa* at uhub? # Belkin serial adapter +ubsa* at uhub? # Belkin serial adapter ucom* at ubsa? -#ulpt* at uhub? # USB Printers -umass* at uhub? # USB Mass Storage devices -uhidev* at uhub? # Human Interface Devices -ums* at uhidev? # USB mouse -wsmouse* at ums? mux 0 -ukbd* at uhidev? # USB keyboard +umass* at uhub? +uhidev* at uhub? # Human Interface Devices +ukbd* at uhidev? # USB keyboard wskbd* at ukbd? mux 1 -uhid* at uhidev? # USB generic HID support -atu* at uhub? # Atmel AT76c50x based 802.11b -aue* at uhub? # ADMtek AN986 Pegasus Ethernet -axe* at uhub? # ASIX Electronics AX88172 USB Ethernet -axen* at uhub? # ASIX Electronics AX88179 USB Ethernet -cdce* at uhub? # CDC Ethernet -cue* at uhub? # CATC USB-EL1201A based Ethernet -kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet -mos* at uhub? # MOSCHIP MCS7730/7830 10/100 Ethernet -otus* at uhub? # Atheros AR9001U -rum* at uhub? # Ralink RT2501USB/RT2601USB -run* at uhub? # Ralink RT2700U/RT2800U/RT3000U -smsc* at uhub? # SMSC LAN95xx Ethernet -uath* at uhub? # Atheros AR5005UG/AR5005UX -udav* at uhub? # Davicom DM9601 based Ethernet -upgt* at uhub? # Conexant/Intersil PrismGT SoftMAC USB -upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' -ugl* at uhub? # Genesys Logic GL620USB-A host-to-host `network' -ural* at uhub? # Ralink RT2500USB -url* at uhub? # Realtek RTL8150L based adapters -urtw* at uhub? # RealTek 8187 -wi* at uhub? # WaveLAN IEEE 802.11DS -zyd* at uhub? # Zydas ZD1211 -ugen* at uhub? # USB Generic driver - -ppb* at pci? # PCI-PCI bridges +uhid* at uhidev? # USB generic HID support +atu* at uhub? # Atmel AT76c50x based 802.11b +aue* at uhub? # ADMtek AN986 Pegasus Ethernet +axe* at uhub? # ASIX Electronics AX88172 USB Ethernet +axen* at uhub? # ASIX Electronics AX88179 USB Ethernet +cdce* at uhub? # CDC Ethernet +cue* at uhub? # CATC USB-EL1201A based Ethernet +kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet +mos* at uhub? # MOSCHIP MCS7730/7830 10/100 Ethernet +otus* at uhub? # Atheros AR9001U +rum* at uhub? # Ralink RT2501USB/RT2601USB +run* at uhub? # Ralink RT2700U/RT2800U/RT3000U +smsc* at uhub? # SMSC LAN95xx Ethernet +uath* at uhub? # Atheros AR5005UG/AR5005UX +udav* at uhub? # Davicom DM9601 based Ethernet +upgt* at uhub? # Conexant/Intersil PrismGT SoftMAC USB +upl* at uhub? # Prolific PL2301/PL2302 host-to-host +ugl* at uhub? # Genesys Logic GL620USB-A host-to-host +ural* at uhub? # Ralink RT2500USB +url* at uhub? # Realtek RTL8150L based adapters +urtw* at uhub? # RealTek 8187 +wi* at uhub? # WaveLAN IEEE 802.11DS +zyd* at uhub? # Zydas ZD1211 +ugen* at uhub? # USB Generic driver + +ppb* at pci? # PCI-PCI bridges pci* at ppb? -#### NICs -pcn* at pci? # AMD PCnet-PCI Ethernet -epic* at pci? # SMC EPIC/100 ethernet -de* at pci? # DC21X4X-based ethernet -dc* at pci? # 21143, "tulip" clone ethernet -sf* at pci? # Adaptec AIC-6915 ethernet -em* at pci? # Intel Pro/1000 ethernet -ep* at pci? # 3Com 3c59x -fxp* at pci? # EtherExpress 10/100B ethernet -mtd* at pci? # Myson MTD803 3-in-1 Ethernet -ne* at pci? # NE2000-compatible Ethernet -ti* at pci? # Alteon ACEnic gigabit Ethernet -stge* at pci? # Sundance TC9021 GigE -vr* at pci? # VIA Rhine Fast Ethernet -xl* at pci? # 3C9xx ethernet -re* at pci? # Realtek 8169/8169S/8110S -rl* at pci? # Realtek 81[23]9 ethernet -hme* at pci? # Sun Happy Meal -gem* at pci? # Sun 'gem' ethernet -cas* at pci? # Sun Cassini 100/Gigabit -skc* at pci? # SysKonnect GEnesis 984x -sk* at skc? # each port of above -mskc* at pci? # Marvell Yukon-2 -msk* at mskc? # each port of above -bge* at pci? # Broadcom BCM570x (aka Tigon3) -vge* at pci? # VIA VT612x -bnx* at pci? # Broadcom BCM5706/5708 GigE -sis* at pci? # SiS 900/7016 ethernet - -##### Media Independent Interface (mii) drivers -exphy* at mii? # 3Com internal PHYs -inphy* at mii? # Intel 82555 PHYs -iophy* at mii? # Intel 82553 PHYs -icsphy* at mii? # ICS 1890 PHYs -lxtphy* at mii? # Level1 LXT970 PHYs -nsphy* at mii? # NS and compatible PHYs -nsphyter* at mii? # NS and compatible PHYs -qsphy* at mii? # Quality Semi QS6612 PHYs -sqphy* at mii? # Seeq 8x220 PHYs -luphy* at mii? # Lucent LU6612 PHY -rlphy* at mii? # RealTek 8139 internal PHYs -mtdphy* at mii? # Myson MTD972 PHYs -dcphy* at mii? # Digital Clone PHYs -acphy* at mii? # Altima AC101 PHYs -amphy* at mii? # AMD 79C873 PHYs -tqphy* at mii? # TDK 78Q212x PHYs -bmtphy* at mii? # Broadcom 10/100 PHYs -brgphy* at mii? # Broadcom Gigabit PHYs -ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY -eephy* at mii? # Marvell 88E1000 series PHY -xmphy* at mii? # XaQti XMAC-II PHYs -nsgphy* at mii? # NS gigabit PHYs -urlphy* at mii? # Realtek RTL8150L internal PHY -rgephy* at mii? # Realtek 8169S/8110S PHY -ipgphy* at mii? # IC Plus IP1000A PHYs -gentbi* at mii? # Generic 1000BASE-X ten-bit PHY -ukphy* at mii? # "unknown" PHYs - -#### Keyboard and Mouse +pcn* at pci? # AMD PCnet-PCI Ethernet +epic* at pci? # SMC EPIC/100 ethernet +de* at pci? # DC21X4X-based ethernet +dc* at pci? # 21143, "tulip" clone ethernet +sf* at pci? # Adaptec AIC-6915 ethernet +em* at pci? # Intel Pro/1000 ethernet +ep* at pci? # 3Com 3c59x +fxp* at pci? # EtherExpress 10/100B ethernet +mtd* at pci? # Myson MTD803 3-in-1 Ethernet +ne* at pci? # NE2000-compatible Ethernet +ti* at pci? # Alteon ACEnic gigabit Ethernet +stge* at pci? # Sundance TC9021 GigE +vr* at pci? # VIA Rhine Fast Ethernet +xl* at pci? # 3C9xx ethernet +re* at pci? # Realtek 8169/8169S/8110S +rl* at pci? # Realtek 81[23]9 ethernet +hme* at pci? # Sun Happy Meal +gem* at pci? # Sun 'gem' ethernet +cas* at pci? # Sun Cassini 100/Gigabit +skc* at pci? # SysKonnect GEnesis 984x +sk* at skc? # each port of above +mskc* at pci? # Marvell Yukon-2 +msk* at mskc? # each port of above +bge* at pci? # Broadcom BCM570x (aka Tigon3) +vge* at pci? # VIA VT612x +bnx* at pci? # Broadcom BCM5706/5708 GigE +sis* at pci? # SiS 900/7016 ethernet + +exphy* at mii? # 3Com internal PHYs +inphy* at mii? # Intel 82555 PHYs +iophy* at mii? # Intel 82553 PHYs +icsphy* at mii? # ICS 1890 PHYs +lxtphy* at mii? # Level1 LXT970 PHYs +nsphy* at mii? # NS and compatible PHYs +nsphyter* at mii? # NS and compatible PHYs +qsphy* at mii? # Quality Semi QS6612 PHYs +sqphy* at mii? # Seeq 8x220 PHYs +luphy* at mii? # Lucent LU6612 PHY +rlphy* at mii? # RealTek 8139 internal PHYs +mtdphy* at mii? # Myson MTD972 PHYs +dcphy* at mii? # Digital Clone PHYs +acphy* at mii? # Altima AC101 PHYs +amphy* at mii? # AMD 79C873 PHYs +tqphy* at mii? # TDK 78Q212x PHYs +bmtphy* at mii? # Broadcom 10/100 PHYs +brgphy* at mii? # Broadcom Gigabit PHYs +ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY +eephy* at mii? # Marvell 88E1000 series PHY +xmphy* at mii? # XaQti XMAC-II PHYs +nsgphy* at mii? # NS gigabit PHYs +urlphy* at mii? # Realtek RTL8150L internal PHY +rgephy* at mii? # Realtek 8169S/8110S PHY +ipgphy* at mii? # IC Plus IP1000A PHYs +gentbi* at mii? # Generic 1000BASE-X ten-bit PHY +ukphy* at mii? # "unknown" PHYs + pckbd* at iockbc? -pms* at iockbc? wskbd* at pckbd? mux 1 -wsmouse* at pms? mux 0 - -#### SCSI Bus devices scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? -#ch* at scsibus? -#uk* at scsibus? - -#### PSEUDO Devices -pseudo-device loop 1 # network loopback -pseudo-device bpfilter 1 # packet filter ports - -pseudo-device rd 1 # Ram disk. -pseudo-device bio 1 # ioctl multiplexing device -option BOOT_CONFIG # add support for boot -c +pseudo-device loop 1 +pseudo-device bpfilter 1 +pseudo-device rd 1 +pseudo-device bio 1 diff --git a/sys/arch/sgi/conf/RAMDISK-IP32 b/sys/arch/sgi/conf/RAMDISK-IP32 index 833a7e42517..38114406bf4 100644 --- a/sys/arch/sgi/conf/RAMDISK-IP32 +++ b/sys/arch/sgi/conf/RAMDISK-IP32 @@ -1,71 +1,52 @@ -# $OpenBSD: RAMDISK-IP32,v 1.25 2014/09/14 18:59:18 brad Exp $ +# $OpenBSD: RAMDISK-IP32,v 1.26 2014/10/10 05:43:35 deraadt Exp $ # # THIS KERNEL IS FOR O2 (IP32) SYSTEMS ONLY. machine sgi mips64 - maxusers 4 -option TIMEZONE=0 # minutes west of GMT (for) -option DST=0 # use daylight savings rules -# Make options +option TIMEZONE=0 +option DST=0 +option SMALL_KERNEL +option NO_PROPOLICE +option BOOT_CONFIG + +option MINIROOTSIZE=10240 +option RAMDISK_HOOKS + makeoption LINK_ADDRESS="0xffffffff80100000" option PCIVERBOSE option USBVERBOSE -option DDB - -# Filesystem options -option CD9660 # ISO 9660 + Rock Ridge file system -option FFS # fast filesystem -option FFS2 # fast filesystem 2 -#option MSDOSFS # Ability to read write MS-Dos filesystem -option NFSCLIENT # Sun NFS-compatible filesystem (client) +option CD9660 +option FFS +option FFS2 +option NFSCLIENT +option INET +option INET6 -# Networking options -option INET # IP + ICMP + TCP + UDP -option INET6 # IPv6 (needs INET) - -# RAMDISK stuff -option MINIROOTSIZE=10240 -option RAMDISK_HOOKS - -# Define what targets to support -option TGT_O2 # O2, O2+ +option TGT_O2 # O2, O2+ option ARCBIOS -option CPU_R5000 # R5000/RM5200 support -option CPU_RM7000 # RM7000 support -option CPU_R10000 # R10000/R12000/R14000/R16000 support +option CPU_R5000 # R5000/RM5200 support +option CPU_RM7000 # RM7000 support +option CPU_R10000 # R10000/R12000/R14000/R16000 support -# Specify storage configuration using ramdisk -config bsd root on rd0a swap on rd0b +config bsd root on rd0a swap on rd0b -# -# Definition of system -# mainbus0 at root cpu* at mainbus0 clock0 at mainbus0 - -#### Main local buses -macebus0 at mainbus0 # MACE controller localbus. - -# GBE Framebuffer -gbe0 at mainbus0 - -#### Localbus devices +macebus0 at mainbus0 # MACE controller localbus. +gbe0 at mainbus0 # GBE Framebuffer mec0 at macebus0 mkbc0 at macebus0 com0 at macebus0 base 0x00390000 com1 at macebus0 base 0x00398000 dsrtc0 at macebus0 +macepcibr0 at macebus0 # MACE controller PCI Bus bridge. +pci* at macepcibr? # PCI is on pci bridge -#### PCI Bus -macepcibr0 at macebus0 # MACE controller PCI Bus bridge. -pci* at macepcibr? # PCI is on pci bridge - -#### SCSI controllers ahc* at pci? qlw* at pci? qla* at pci? @@ -73,139 +54,119 @@ qle* at pci? mpi* at pci? siop* at pci? -# USB Controllers -ohci* at pci? # Open Host Controller -uhci* at pci? # Universal Host Controller -ehci* at pci? # Enhanced Host Controller - -# USB bus support +ohci* at pci? +uhci* at pci? +ehci* at pci? usb* at ohci? usb* at uhci? usb* at ehci? -# USB devices -uhub* at usb? # USB Hubs -uhub* at uhub? # USB Hubs -umodem* at uhub? # USB Modems/Serial +uhub* at usb? +uhub* at uhub? +umodem* at uhub? # USB Modems/Serial ucom* at umodem? -uvscom* at uhub? # SUNTAC Slipper U VS-10U serial +uvscom* at uhub? # SUNTAC Slipper U VS-10U serial ucom* at uvscom? -ubsa* at uhub? # Belkin serial adapter +ubsa* at uhub? # Belkin serial adapter ucom* at ubsa? -#ulpt* at uhub? # USB Printers -umass* at uhub? # USB Mass Storage devices -uhidev* at uhub? # Human Interface Devices -ums* at uhidev? # USB mouse -wsmouse* at ums? mux 0 -ukbd* at uhidev? # USB keyboard +umass* at uhub? +uhidev* at uhub? # Human Interface Devices +ukbd* at uhidev? # USB keyboard wskbd* at ukbd? mux 1 -uhid* at uhidev? # USB generic HID support -atu* at uhub? # Atmel AT76c50x based 802.11b -aue* at uhub? # ADMtek AN986 Pegasus Ethernet -axe* at uhub? # ASIX Electronics AX88172 USB Ethernet -axen* at uhub? # ASIX Electronics AX88179 USB Ethernet -cdce* at uhub? # CDC Ethernet -cue* at uhub? # CATC USB-EL1201A based Ethernet -kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet -mos* at uhub? # MOSCHIP MCS7730/7830 10/100 Ethernet -otus* at uhub? # Atheros AR9001U -rum* at uhub? # Ralink RT2501USB/RT2601USB -run* at uhub? # Ralink RT2700U/RT2800U/RT3000U -smsc* at uhub? # SMSC LAN95xx Ethernet -uath* at uhub? # Atheros AR5005UG/AR5005UX -udav* at uhub? # Davicom DM9601 based Ethernet -upgt* at uhub? # Conexant/Intersil PrismGT SoftMAC USB -upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' -ugl* at uhub? # Genesys Logic GL620USB-A host-to-host `network' -ural* at uhub? # Ralink RT2500USB -url* at uhub? # Realtek RTL8150L based adapters -urtw* at uhub? # RealTek 8187 -wi* at uhub? # WaveLAN IEEE 802.11DS -zyd* at uhub? # Zydas ZD1211 -ugen* at uhub? # USB Generic driver - -ppb* at pci? # PCI-PCI bridges +uhid* at uhidev? # USB generic HID support +atu* at uhub? # Atmel AT76c50x based 802.11b +aue* at uhub? # ADMtek AN986 Pegasus Ethernet +axe* at uhub? # ASIX Electronics AX88172 USB Ethernet +axen* at uhub? # ASIX Electronics AX88179 USB Ethernet +cdce* at uhub? # CDC Ethernet +cue* at uhub? # CATC USB-EL1201A based Ethernet +kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet +mos* at uhub? # MOSCHIP MCS7730/7830 10/100 Ethernet +otus* at uhub? # Atheros AR9001U +rum* at uhub? # Ralink RT2501USB/RT2601USB +run* at uhub? # Ralink RT2700U/RT2800U/RT3000U +smsc* at uhub? # SMSC LAN95xx Ethernet +uath* at uhub? # Atheros AR5005UG/AR5005UX +udav* at uhub? # Davicom DM9601 based Ethernet +upgt* at uhub? # Conexant/Intersil PrismGT SoftMAC USB +upl* at uhub? # Prolific PL2301/PL2302 host-to-host +ugl* at uhub? # Genesys Logic GL620USB-A host-to-host +ural* at uhub? # Ralink RT2500USB +url* at uhub? # Realtek RTL8150L based adapters +urtw* at uhub? # RealTek 8187 +wi* at uhub? # WaveLAN IEEE 802.11DS +zyd* at uhub? # Zydas ZD1211 +ugen* at uhub? # USB Generic driver + +ppb* at pci? pci* at ppb? -#### NICs -pcn* at pci? # AMD PCnet-PCI Ethernet -epic* at pci? # SMC EPIC/100 ethernet -de* at pci? # DC21X4X-based ethernet -dc* at pci? # 21143, "tulip" clone ethernet -sf* at pci? # Adaptec AIC-6915 ethernet -em* at pci? # Intel Pro/1000 ethernet -ep* at pci? # 3Com 3c59x -fxp* at pci? # EtherExpress 10/100B ethernet -mtd* at pci? # Myson MTD803 3-in-1 Ethernet -ne* at pci? # NE2000-compatible Ethernet -ti* at pci? # Alteon ACEnic gigabit Ethernet -stge* at pci? # Sundance TC9021 GigE -vr* at pci? # VIA Rhine Fast Ethernet -xl* at pci? # 3C9xx ethernet -re* at pci? # Realtek 8169/8169S/8110S -rl* at pci? # Realtek 81[23]9 ethernet -hme* at pci? # Sun Happy Meal -gem* at pci? # Sun 'gem' ethernet -cas* at pci? # Sun Cassini 100/Gigabit -skc* at pci? # SysKonnect GEnesis 984x -sk* at skc? # each port of above -mskc* at pci? # Marvell Yukon-2 -msk* at mskc? # each port of above -bge* at pci? # Broadcom BCM570x (aka Tigon3) -vge* at pci? # VIA VT612x -bnx* at pci? # Broadcom BCM5706/5708 GigE -sis* at pci? # SiS 900/7016 ethernet - -##### Media Independent Interface (mii) drivers -exphy* at mii? # 3Com internal PHYs -inphy* at mii? # Intel 82555 PHYs -iophy* at mii? # Intel 82553 PHYs -icsphy* at mii? # ICS 1890 PHYs -lxtphy* at mii? # Level1 LXT970 PHYs -nsphy* at mii? # NS and compatible PHYs -nsphyter* at mii? # NS and compatible PHYs -qsphy* at mii? # Quality Semi QS6612 PHYs -sqphy* at mii? # Seeq 8x220 PHYs -luphy* at mii? # Lucent LU6612 PHY -rlphy* at mii? # RealTek 8139 internal PHYs -mtdphy* at mii? # Myson MTD972 PHYs -dcphy* at mii? # Digital Clone PHYs -acphy* at mii? # Altima AC101 PHYs -amphy* at mii? # AMD 79C873 PHYs -tqphy* at mii? # TDK 78Q212x PHYs -bmtphy* at mii? # Broadcom 10/100 PHYs -brgphy* at mii? # Broadcom Gigabit PHYs -ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY -eephy* at mii? # Marvell 88E1000 series PHY -xmphy* at mii? # XaQti XMAC-II PHYs -nsgphy* at mii? # NS gigabit PHYs -urlphy* at mii? # Realtek RTL8150L internal PHY -rgephy* at mii? # Realtek 8169S/8110S PHY -ipgphy* at mii? # IC Plus IP1000A PHYs -gentbi* at mii? # Generic 1000BASE-X ten-bit PHY -ukphy* at mii? # "unknown" PHYs - -#### WS console -wsdisplay* at gbe? +pcn* at pci? # AMD PCnet-PCI Ethernet +epic* at pci? # SMC EPIC/100 ethernet +de* at pci? # DC21X4X-based ethernet +dc* at pci? # 21143, "tulip" clone ethernet +sf* at pci? # Adaptec AIC-6915 ethernet +em* at pci? # Intel Pro/1000 ethernet +ep* at pci? # 3Com 3c59x +fxp* at pci? # EtherExpress 10/100B ethernet +mtd* at pci? # Myson MTD803 3-in-1 Ethernet +ne* at pci? # NE2000-compatible Ethernet +ti* at pci? # Alteon ACEnic gigabit Ethernet +stge* at pci? # Sundance TC9021 GigE +vr* at pci? # VIA Rhine Fast Ethernet +xl* at pci? # 3C9xx ethernet +re* at pci? # Realtek 8169/8169S/8110S +rl* at pci? # Realtek 81[23]9 ethernet +hme* at pci? # Sun Happy Meal +gem* at pci? # Sun 'gem' ethernet +cas* at pci? # Sun Cassini 100/Gigabit +skc* at pci? # SysKonnect GEnesis 984x +sk* at skc? # each port of above +mskc* at pci? # Marvell Yukon-2 +msk* at mskc? # each port of above +bge* at pci? # Broadcom BCM570x (aka Tigon3) +vge* at pci? # VIA VT612x +bnx* at pci? # Broadcom BCM5706/5708 GigE +sis* at pci? # SiS 900/7016 ethernet + +exphy* at mii? # 3Com internal PHYs +inphy* at mii? # Intel 82555 PHYs +iophy* at mii? # Intel 82553 PHYs +icsphy* at mii? # ICS 1890 PHYs +lxtphy* at mii? # Level1 LXT970 PHYs +nsphy* at mii? # NS and compatible PHYs +nsphyter* at mii? # NS and compatible PHYs +qsphy* at mii? # Quality Semi QS6612 PHYs +sqphy* at mii? # Seeq 8x220 PHYs +luphy* at mii? # Lucent LU6612 PHY +rlphy* at mii? # RealTek 8139 internal PHYs +mtdphy* at mii? # Myson MTD972 PHYs +dcphy* at mii? # Digital Clone PHYs +acphy* at mii? # Altima AC101 PHYs +amphy* at mii? # AMD 79C873 PHYs +tqphy* at mii? # TDK 78Q212x PHYs +bmtphy* at mii? # Broadcom 10/100 PHYs +brgphy* at mii? # Broadcom Gigabit PHYs +ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY +eephy* at mii? # Marvell 88E1000 series PHY +xmphy* at mii? # XaQti XMAC-II PHYs +nsgphy* at mii? # NS gigabit PHYs +urlphy* at mii? # Realtek RTL8150L internal PHY +rgephy* at mii? # Realtek 8169S/8110S PHY +ipgphy* at mii? # IC Plus IP1000A PHYs +gentbi* at mii? # Generic 1000BASE-X ten-bit PHY +ukphy* at mii? # "unknown" PHYs -#### Keyboard and Mouse +wsdisplay* at gbe? pckbd* at mkbc? wskbd* at pckbd? console ? -#### SCSI Bus devices - scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? -#ch* at scsibus? -#uk* at scsibus? - -#### PSEUDO Devices -pseudo-device loop 1 # network loopback -pseudo-device bpfilter 1 # packet filter ports - -pseudo-device rd 1 # Ram disk. -pseudo-device bio 1 # ioctl multiplexing device -option BOOT_CONFIG # add support for boot -c +pseudo-device loop 1 +pseudo-device bpfilter 1 +pseudo-device rd 1 +pseudo-device bio 1 diff --git a/sys/arch/socppc/conf/RAMDISK b/sys/arch/socppc/conf/RAMDISK index 03b49de0665..416ef215fd5 100644 --- a/sys/arch/socppc/conf/RAMDISK +++ b/sys/arch/socppc/conf/RAMDISK @@ -1,91 +1,80 @@ -# $OpenBSD: RAMDISK,v 1.9 2011/06/29 20:52:09 matthew Exp $ +# $OpenBSD: RAMDISK,v 1.10 2014/10/10 05:43:35 deraadt Exp $ machine socppc powerpc +maxusers 4 -maxusers 32 # estimated number of users +option TIMEZONE=0 +option DST=0 +option SMALL_KERNEL +option NO_PROPOLICE +option BOOT_CONFIG + +option MINIROOTSIZE=8192 +option RAMDISK_HOOKS option PCIVERBOSE option USBVERBOSE -option FFS # UFS -option FFS2 # UFS2 -option NFSCLIENT # Network File System client -option CD9660 # ISO 9660 + Rock Ridge file system -option UDF # UDF (DVD) file system -option MSDOSFS # MS-DOS file system -option INET # IP + ICMP + TCP + UDP -option INET6 # IPv6 (needs INET) -option DDB # kernel debugger +option FFS +option FFS2 +option NFSCLIENT +option CD9660 +option UDF +option MSDOSFS +option INET +option INET6 -config bsd root on rd0a swap on rd0b +config bsd root on rd0a swap on rd0b mainbus0 at root cpu0 at mainbus0 obio0 at mainbus0 +ipic0 at obio? -# On-board CF -wdc0 at mainbus0 +wdc0 at mainbus0 # On-board CF wdc1 at mainbus0 wd* at wdc? flags 0x0000 -# On-board IPIC -ipic0 at obio? - -# On-board I2C sociic0 at obio? sociic1 at obio? iic* at sociic? ricohrtc0 at iic? addr 0x32 # Ricoh RTC fintek0 at iic? flags 0x0001 # temp/fan controller -# On-board DUART com0 at obio? com1 at obio? -# On-board PCI socpcic* at mainbus? socpcic* at obio? -pci* at socpcic? +tsec0 at obio? +tsec1 at obio? +pci* at socpcic? pciide* at pci? wd* at pciide? flags 0x0000 -vge* at pci? - -# On-board USB ehci0 at obio? usb* at ehci? -# USB devices -uhub* at usb? # USB Hubs -uhub* at uhub? # USB Hubs -umass* at uhub? # USB Mass Storage devices -ural* at uhub? # Ralink RT2500USB -rum* at uhub? # Ralink RT2501USB/RT2601USB -zyd* at uhub? # Zydas ZD1211 +uhub* at usb? +uhub* at uhub? +umass* at uhub? +ural* at uhub? # Ralink RT2500USB +rum* at uhub? # Ralink RT2501USB/RT2601USB +zyd* at uhub? # Zydas ZD1211 scsibus* at scsi? sd* at scsibus? -# On-board TSEC -tsec0 at obio? -tsec1 at obio? - -rgephy* at mii? # Realtek 8169S/8110S PHY -eephy* at mii? # Marvell 88E1000 series PHY -ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY -gentbi* at mii? # Generic 1000BASE-X ten-bit PHY -ukphy* at mii? # Generic unknown PHY - -# PCI -athn* at pci? # Atheros AR9k (802.11a/g/n) - -pseudo-device loop 1 # network loopback -pseudo-device bpfilter 1 # packet filter -pseudo-device rd 1 # ram disk +vge* at pci? +athn* at pci? # Atheros AR9k (802.11a/g/n) -option BOOT_CONFIG # boot-time kernel config +rgephy* at mii? # Realtek 8169S/8110S PHY +eephy* at mii? # Marvell 88E1000 series PHY +ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY +gentbi* at mii? # Generic 1000BASE-X ten-bit PHY +ukphy* at mii? # Generic unknown PHY -# RAMDISK stuff -option MINIROOTSIZE=8192 -option RAMDISK_HOOKS +pseudo-device loop 1 +pseudo-device bpfilter 1 +pseudo-device rd 1 diff --git a/sys/arch/sparc/conf/RAMDISK b/sys/arch/sparc/conf/RAMDISK index f4743f07006..fbababc9c01 100644 --- a/sys/arch/sparc/conf/RAMDISK +++ b/sys/arch/sparc/conf/RAMDISK @@ -1,331 +1,218 @@ -# $OpenBSD: RAMDISK,v 1.75 2012/07/22 18:30:16 deraadt Exp $ -# $NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $ +# $OpenBSD: RAMDISK,v 1.76 2014/10/10 05:43:35 deraadt Exp $ -# Machine architecture; required by config(8) machine sparc +maxusers 4 -# maxusers means mostly "let's get small" in terms of kernel malloc's -maxusers 2 +option TIMEZONE=0 +option DST=0 +option SMALL_KERNEL +option NO_PROPOLICE +option BOOT_CONFIG -# the size for MINIROOTSIZE must insure: 16384+size(bsd) < RELOC(boot,bootxx) -option RAMDISK_HOOKS +option RAMDISK_HOOKS # 16384+size(bsd) < RELOC(boot,bootxx) option MINIROOTSIZE=4000 -#option DDB # need this to see what's happening +option FFS +option CD9660 +option INET -option TIMEZONE=0 # time zone to adjust RTC time by -option DST=0 # daylight saving time used by RTC +option WSEMUL_SUN # provide sun terminal emulation; required +option WSEMUL_NO_VT100 # do not provide vt100 terminal emulation -option SMALL_KERNEL -option NO_PROPOLICE -option FFS # UFS -#option NFSCLIENT # Network File System client -option CD9660 # ISO 9660 + Rock Ridge file system -option INET # IP + ICMP + TCP + UDP -#option INET6 # IPv6 (needs INET) -option BOOT_CONFIG # add support for boot -c -#option CRYPTO # Cryptographic framework - -# Options for variants of the Sun SPARC architecture. -# At least one is required. option SUN4 # sun4/100, sun4/200, sun4/300 option SUN4C # sun4c - SS1, 1+, 2, ELC, SLC, IPC, IPX, etc. option SUN4E # sun4e - SPARCengine 1E option SUN4M # sun4m - SS10, SS20, Classic, etc. -#option MMU_3L # 3-level MMU on sun4/400 - -#option KGDB # support for kernel gdb -#option KGDBDEV=0xc01 # kgdb device number (dev_t) -#option KGDBRATE=38400 # baud rate - -option WSEMUL_SUN # provide sun terminal emulation; required -option WSEMUL_NO_VT100 # do not provide vt100 terminal emulation - -# Generic swap; second partition of root disk or network. -config bsd root on rd0a - -# Main bus and CPU .. all systems. -mainbus0 at root -cpu0 at mainbus0 - -# Bus types found on SPARC systems. -sbus0 at mainbus0 # sun4c and sun4e -obio0 at mainbus0 # sun4 and sun4m -vmes0 at mainbus0 # sun4 -vmel0 at mainbus0 # sun4 -iommu0 at mainbus0 # sun4m -sbus0 at iommu0 # sun4m +config bsd root on rd0a -#audioamd0 at mainbus0 # sun4c -#audioamd0 at obio0 # sun4m -#audioamd0 at sbus0 # sun4m -#audio* at audioamd? +mainbus0 at root +cpu0 at mainbus0 -auxreg* at mainbus0 # sun4c and sun4e -auxreg* at obio0 # sun4m +sbus0 at mainbus0 # sun4c and sun4e +obio0 at mainbus0 # sun4 and sun4m +vmes0 at mainbus0 # sun4 +vmel0 at mainbus0 # sun4 +iommu0 at mainbus0 # sun4m +sbus0 at iommu0 # sun4m -# Power status and control register found on Sun4m systems -power0 at obio0 +auxreg* at mainbus0 # sun4c and sun4e +auxreg* at obio0 # sun4m +power0 at obio0 # sun4m # Mostek clock found on 4/300, sun4c, and sun4m systems. # The Mostek clock NVRAM is the "eeprom" on sun4/300 systems. -clock0 at mainbus0 # sun4c and sun4e -clock0 at obio0 # sun4m -clock0 at obio0 addr 0xf2000000 # sun4/300 +clock0 at mainbus0 # sun4c and sun4e +clock0 at obio0 # sun4m +clock0 at obio0 addr 0xf2000000 # sun4/300 +oclock0 at obio0 addr 0xf3000000 # sun4/100 and sun4/200 -# Intersil clock found on 4/100 and 4/200 systems. -oclock0 at obio0 addr 0xf3000000 # sun4/100 and sun4/200 +memreg0 at mainbus0 # sun4c and sun4e +memreg0 at obio0 # sun4m +memreg0 at obio0 addr 0xf4000000 # sun4 -# Memory error registers. -memreg0 at mainbus0 # sun4c and sun4e -memreg0 at obio0 # sun4m -memreg0 at obio0 addr 0xf4000000 # sun4 +timer0 at mainbus0 # sun4c and sun4e +timer0 at obio0 # sun4m +timer0 at obio0 addr 0xef000000 # sun4/300 -# Timer chip found on 4/300, sun4c, and sun4m systems. -timer0 at mainbus0 # sun4c and sun4e -timer0 at obio0 # sun4m -timer0 at obio0 addr 0xef000000 # sun4/300 - -# EEPROM found on 4/100 and 4/200 systems. Note that the 4/300 -# doesn't use this driver; the `EEPROM' is in the NVRAM on the -# Mostek clock chip on 4/300 systems. -eeprom0 at obio0 addr 0xf2000000 # sun4/100 and sun4/200 +eeprom0 at obio0 addr 0xf2000000 # sun4/100 and sun4/200 # Zilog 8530 serial chips. Each has two-channels. # zs0 is ttya and ttyb. zs1 is the keyboard and mouse. -zs0 at mainbus0 # sun4c and sun4e -zs0 at obio0 # sun4m -zs0 at obio0 addr 0xf1000000 level 12 # sun4 -zs1 at mainbus0 # sun4c and sun4e -zs1 at obio0 # sun4m -zs1 at obio0 addr 0xf0000000 level 12 # sun4 -zs2 at obio0 addr 0xe0000000 level 12 # sun4/300 - -zstty* at zs? -zskbd* at zs? -wskbd* at zskbd? - -# SUNW,xbox SBus Expansion Subsystem -xbox* at sbus? # SBus Expansion box -sbus* at xbox? - -# -# Note the flags on the esp entries below, that work around -# deficiencies in the current driver: +zs0 at mainbus0 # sun4c and sun4e +zs0 at obio0 # sun4m +zs0 at obio0 addr 0xf1000000 level 12 # sun4 +zs1 at mainbus0 # sun4c and sun4e +zs1 at obio0 # sun4m +zs1 at obio0 addr 0xf0000000 level 1 # sun4 +zs2 at obio0 addr 0xe0000000 level 12 # sun4/300 + +zstty* at zs? +zskbd* at zs? +wskbd* at zskbd? + +xbox* at sbus? # SBus Expansion box +sbus* at xbox? + +# The flags on the esp entries below work around deficiencies in the driver: # bits 0-7: disable disconnect/reselect for the corresponding target # bits 8-15: disable synch negotiation for target [bit-8] # Note: targets 4-7 have disconnect/reselect enabled on the premise # that tape devices normally have one of these targets. Tape # devices should be allowed to disconnect for the SCSI bus # to operate acceptably. -# # sun4/300 SCSI - an NCR53c94 or equivalent behind # an LSI Logic DMA controller -dma0 at obio0 addr 0xfa001000 level 4 # sun4/300 -esp0 at obio0 addr 0xfa000000 level 4 flags 0x00ff000f +dma0 at obio0 addr 0xfa001000 level 4 # sun4/300 +esp0 at obio0 addr 0xfa000000 level 4 flags 0x00ff000f # sun4c or sun4m SCSI - an NCR53c94 or equivalent behind # specialized DMA glue -dma0 at sbus0 # on-board SCSI -esp0 at sbus0 flags 0x00ff000f # sun4c and sun4e -esp0 at dma0 flags 0x00ff000f # sun4m +dma0 at sbus0 # on-board SCSI +esp0 at sbus0 flags 0x00ff000f # sun4c and sun4e +esp0 at dma0 flags 0x00ff000f # sun4m # FSBE/S SCSI - an NCR53c94 or equivalent behind -dma* at sbus? # SBus SCSI -esp* at sbus? flags 0x00ff000f # two flavours -esp* at dma? flags 0x00ff000f # depending on model - -# sun4m Ethernet - an AMD 7990 LANCE behind specialized DMA glue -ledma0 at sbus? # sun4m on-board -le0 at ledma0 # -ledma* at sbus? # Anteres sbus -le* at ledma? # - -# Additional SBus LANCE devices - glued on by lebuffer -lebuffer0 at sbus0 # sun4m SBus -lebuffer* at sbus? # sun4m SBus -le0 at lebuffer0 # -le* at lebuffer? # +dma* at sbus? # SBus SCSI +esp* at sbus? flags 0x00ff000f # two flavours +esp* at dma? flags 0x00ff000f # depending on model -# sun4/300 and sun4c Ethernet - an AMD 7990 LANCE -le0 at sbus0 # sun4c/sun4e on-board -le* at sbus? +ledma0 at sbus? # sun4m on-board +le0 at ledma0 +ledma* at sbus? # Anteres sbus +le* at ledma? -le0 at obio0 addr 0xf9000000 level 6 # sun4/300 +lebuffer0 at sbus0 # sun4m SBus +lebuffer* at sbus? # sun4m SBus +le0 at lebuffer0 +le* at lebuffer? + +# sun4/300 and sun4c Ethernet - an AMD 7990 LANCE +le0 at sbus0 # sun4c/sun4e on-board +le* at sbus? +le0 at obio0 addr 0xf9000000 level 6 # sun4/300 # sun4/100 and sun4/200 Ethernet - an Intel 82586 on-board # or on a Multibus/VME card. -ie0 at obio0 addr 0xf6000000 level 6 # sun4/100 and sun4/200 - -ie1 at vmes0 addr 0xffe88000 level 5 vect 0x75 -ie2 at vmes0 addr 0xff31ff02 level 5 vect 0x76 -ie3 at vmes0 addr 0xff35ff02 level 5 vect 0x77 -ie4 at vmes0 addr 0xff2dff02 level 5 vect 0x7c - -# HappyMeal ethernet -hme* at sbus? -# Media Independent Interface (mii) drivers (required for hme) -gentbi* at mii? # Generic 1000BASE-X ten-bit PHY -nsphy* at mii? # NS and compatible PHYs -qsphy* at mii? # Quality Semi QS6612 PHYs -luphy* at mii? # Lucent LU6612 PHY -ukphy* at mii? - -# Quad-ethernet glue device, and sub-devices -qec* at sbus? -qe* at qec? -be* at qec? - -# Gigabit ethernet -gem* at sbus? +ie0 at obio0 addr 0xf6000000 level 6 # sun4/100 and sun4/200 +ie1 at vmes0 addr 0xffe88000 level 5 vect 0x75 +ie2 at vmes0 addr 0xff31ff02 level 5 vect 0x76 +ie3 at vmes0 addr 0xff35ff02 level 5 vect 0x77 +ie4 at vmes0 addr 0xff2dff02 level 5 vect 0x7c + +hme* at sbus? +qec* at sbus? +qe* at qec? +be* at qec? +gem* at sbus? + +gentbi* at mii? # Generic 1000BASE-X ten-bit PHY +nsphy* at mii? # NS and compatible PHYs +qsphy* at mii? # Quality Semi QS6612 PHYs +luphy* at mii? # Lucent LU6612 PHY +ukphy* at mii? # Xylogics 753 or 7053 VME SMD disk controllers and disks, found # on sun4 systems. -xdc0 at vmel0 addr 0xffffee80 level 3 vect 0x44 -xdc1 at vmel0 addr 0xffffee90 level 3 vect 0x45 -xdc2 at vmel0 addr 0xffffeea0 level 3 vect 0x46 -xdc3 at vmel0 addr 0xffffeeb0 level 3 vect 0x47 -xd* at xdc? +xdc0 at vmel0 addr 0xffffee80 level 3 vect 0x44 +xdc1 at vmel0 addr 0xffffee90 level 3 vect 0x45 +xdc2 at vmel0 addr 0xffffeea0 level 3 vect 0x46 +xdc3 at vmel0 addr 0xffffeeb0 level 3 vect 0x47 +xd* at xdc? # Xylogics 451 or 451 VME SMD disk controllers and disks, found # on sun4 systems. -xyc0 at vmes0 addr 0xffffee40 level 3 vect 0x48 -xyc1 at vmes0 addr 0xffffee48 level 3 vect 0x49 -xy* at xyc? - -# Sun PCMCIA bridge -#stp* at sbus? -#pcmcia* at stp? - -# PCMCIA controller found on Tadpole SPARCbook -#tslot* at sbus? -#pcmcia* at tslot? - -# PCMCIA devices -#wi* at pcmcia? # WaveLAN IEEE 802.11DS -#an* at pcmcia? # Aironet IEEE 802.11DS -#ne* at pcmcia? # NE2000-compat ethernet -#ep* at pcmcia? # PCMCIA based 3C5xx ethernet -#com* at pcmcia? # PCMCIA modems/serial ports +xyc0 at vmes0 addr 0xffffee40 level 3 vect 0x48 +xyc1 at vmes0 addr 0xffffee48 level 3 vect 0x49 +xy* at xyc? # NCR5380-based "Sun SCSI 3" VME SCSI controller. # This driver has several flags which may be enabled by OR'ing -# the values and using the "flags" directive. -# Valid flags are: -# +# the values and using the "flags" directive. Valid flags are: # 0x01 Use DMA (may be polled) # 0x02 Use DMA completion interrupts # 0x04 Allow disconnect/reselect -# -# E.g. the following would enable DMA, interrupts, and reselect: -# si0 at vmes0 addr 0xff200000 level 3 vect 0x40 flags 0x07 -# -si0 at vmes0 addr 0xff200000 level 3 vect 0x40 flags 0x01 +si0 at vmes0 addr 0xff200000 level 3 vect 0x40 flags 0x01 # NCR5380-based "SCSI Weird" on-board SCSI interface found # on sun4/100 systems. The flags are the same as the "si" # controller. Note, while DMA is enabled by default, only # polled DMA works at this time, and reselects do not work # on this particular controller. -sw0 at obio0 addr 0xfa000000 level 3 flags 0x01 - -# Sun "bwtwo" black and white framebuffer, found on sun4, sun4c, and sun4m -# systems. -bwtwo0 at sbus0 # sun4c on-board -bwtwo* at sbus? # sun4c and sun4m -bwtwo0 at obio0 addr 0xfd000000 level 4 # sun4/200 -bwtwo0 at obio0 addr 0xfb300000 level 4 # sun4/100 and sun4/300 P4 -wsdisplay* at bwtwo? - -# Sun "cgtwo" VME color framebuffer. -cgtwo0 at vmes0 addr 0xff400000 level 4 vect 0xa8 -wsdisplay* at cgtwo? - -# Sun "cgthree" SBus color framebuffer. -cgthree* at sbus? -wsdisplay* at cgthree? - -# Sun "cgfour" color framebuffer. -cgfour0 at obio0 addr 0xfb300000 level 4 # sun4/100 and sun4/300 P4 -wsdisplay* at cgfour? - -# Sun "cgsix" accelerated color framebuffer. -cgsix0 at sbus? -cgsix* at sbus? -cgsix0 at obio0 addr 0xfb000000 level 4 # sun4/100 and sun4/300 P4 -wsdisplay* at cgsix? - -# Sun "cgeight" 24-bit framebuffer. -cgeight0 at obio0 addr 0xfb300000 level 4 # sun4/100 and sun4/300 P4 -wsdisplay* at cgeight? - -# Sun "tcx" accelerated color framebuffer. -tcx* at sbus? -wsdisplay* at tcx? - -# Sun "cgfourteen" accelerated 24-bit framebuffer. -cgfourteen0 at obio0 addr 0x9c000000 flags 0x0001 # sun4m -cgfourteen1 at obio0 addr 0x90000000 flags 0x0001 # sun4m -wsdisplay* at cgfourteen? - -# Sun "cgtwelve" (GS) accelerated 24-bit framebuffer. +sw0 at obio0 addr 0xfa000000 level 3 flags 0x01 + +bwtwo0 at sbus0 # sun4c on-board +bwtwo* at sbus? # sun4c and sun4m +bwtwo0 at obio0 addr 0xfd000000 level 4 # sun4/200 +bwtwo0 at obio0 addr 0xfb300000 level 4 # sun4/100 and sun4/300 P4 +wsdisplay* at bwtwo? +cgtwo0 at vmes0 addr 0xff400000 level 4 vect 0xa8 +wsdisplay* at cgtwo? +cgthree* at sbus? +wsdisplay* at cgthree? +cgfour0 at obio0 addr 0xfb300000 level 4 # sun4/100 and sun4/300 P4 +wsdisplay* at cgfour? +cgsix0 at sbus? +cgsix* at sbus? +cgsix0 at obio0 addr 0xfb000000 level 4 # sun4/100 and sun4/300 P4 +wsdisplay* at cgsix? +cgeight0 at obio0 addr 0xfb300000 level 4 # sun4/100 and sun4/300 P4 +wsdisplay* at cgeight? +tcx* at sbus? +wsdisplay* at tcx? +cgfourteen0 at obio0 addr 0x9c000000 flags 0x0001 # sun4m +cgfourteen1 at obio0 addr 0x90000000 flags 0x0001 # sun4m +wsdisplay* at cgfourteen? cgtwelve* at sbus? -wsdisplay* at cgtwelve? - -# Sun "leo" (ZX) accelerated 24-bit framebuffer. -zx* at sbus? -wsdisplay* at zx? - -# Vigra VS10 or VS12 framebuffer. -vigra* at sbus? -wsdisplay* at vigra? - -# Weitek P9000 found on Tadpole SPARCbook 3, with external ``Chameleon'' RAMDAC -pninek0 at sbus? -btcham0 at obio? -wsdisplay* at pninek? - -# Weitek P9100 found on Tadpole SPARCbook 3GS/3GX/3TX/3XP -pnozz0 at sbus? -wsdisplay* at pnozz? - -# Parallax XVideo and PowerVideo -tvtwo* at sbus? -wsdisplay* at tvtwo? - -# Fujitsu AG-10e framebuffer. -agten* at sbus? -wsdisplay* at agten? - -# Southland Media Systems MGX/MGXPlus framebuffer. -mgx* at sbus? -wsdisplay* at mgx? - -# Vitec/Connectware/AP&D RasterFlex framebuffer series. -rfx* at sbus? -wsdisplay* at rfx? - -# SCSI bus layer. SCSI devices attach to the SCSI bus, which attaches -# to the underlying hardware controller. - -# These entries find devices on all SCSI busses and assign -# unit numers dynamically. -scsibus* at scsi? -sd* at scsibus? # SCSI disks -#st* at scsibus? # SCSI tapes -cd* at scsibus? # SCSI CD-ROMs -#ch* at scsibus? # SCSI changer devices -#uk* at scsibus? # unknown SCSI devices - -# Floppy controller and drive found on SPARCstations. -fdc0 at mainbus0 # sun4c controller -fdc0 at obio0 # sun4m controller -fd* at fdc0 # the drive itself - -pseudo-device rd 2 -pseudo-device loop 1 # network loopback -pseudo-device bpfilter 1 # packet filter -#pseudo-device pty 4 # pseudo-terminals -#pseudo-device bio 1 # ioctl multiplexing device +wsdisplay* at cgtwelve? +zx* at sbus? +wsdisplay* at zx? +vigra* at sbus? +wsdisplay* at vigra? +pninek0 at sbus? +btcham0 at obio? +wsdisplay* at pninek? +pnozz0 at sbus? +wsdisplay* at pnozz? +tvtwo* at sbus? +wsdisplay* at tvtwo? +agten* at sbus? +wsdisplay* at agten? +mgx* at sbus? +wsdisplay* at mgx? +rfx* at sbus? +wsdisplay* at rfx? + +scsibus* at scsi? +sd* at scsibus? +#st* at scsibus? +cd* at scsibus? + +fdc0 at mainbus0 # sun4c controller +fdc0 at obio0 # sun4m controller +fd* at fdc0 + +pseudo-device rd 1 +pseudo-device loop 1 +pseudo-device bpfilter 1 diff --git a/sys/arch/sparc64/conf/RAMDISK b/sys/arch/sparc64/conf/RAMDISK index 6755d23196c..3bfcc7d8470 100644 --- a/sys/arch/sparc64/conf/RAMDISK +++ b/sys/arch/sparc64/conf/RAMDISK @@ -1,283 +1,250 @@ -# $OpenBSD: RAMDISK,v 1.113 2014/09/14 19:02:43 brad Exp $ +# $OpenBSD: RAMDISK,v 1.114 2014/10/10 05:43:36 deraadt Exp $ -# Machine architecture; required by config(8) machine sparc64 +maxusers 4 -# maxusers means mostly "let's get small" in terms of kernel malloc's -maxusers 2 +option TIMEZONE=0 +option DST=0 +option SMALL_KERNEL +option NO_PROPOLICE +option BOOT_CONFIG option RAMDISK_HOOKS option MINIROOTSIZE=6144 -option SUN4US -option SUN4V - option PCIVERBOSE -#option USBVERBOSE - -#option DDB # need this to see what's happening -option TIMEZONE=0 # time zone to adjust RTC time by -option DST=0 # daylight saving time used by RTC - -option SMALL_KERNEL -option NO_PROPOLICE -option FFS # UFS -option FFS2 # UFS2 -option NFSCLIENT # Network File System client -option CD9660 # ISO 9660 + Rock Ridge file system -option MSDOSFS # MS-DOS file system -option UDF # UDF (DVD) file system -option INET # IP + ICMP + TCP + UDP -option INET6 # IPv6 (needs INET) -option BOOT_CONFIG # add support for boot -c -option CRYPTO # Cryptographic framework +option FFS +option FFS2 +option NFSCLIENT +option CD9660 +option MSDOSFS +option UDF +option INET +option INET6 +option CRYPTO option WSEMUL_SUN # provide sun terminal emulation; required option WSEMUL_NO_VT100 # do not provide vt100 terminal emulation option WSEMUL_DUMB -# Generic swap; second partition of root disk or network. -config bsd root on rd0a - -# Main bus and CPU .. all systems. -mainbus0 at root -cpu0 at mainbus0 -ssm* at mainbus0 -cpu0 at ssm? -cmp* at mainbus0 -cpu0 at cmp? -core* at cmp? -cpu0 at core? - -# Bus types found on SPARC systems. -sbus* at mainbus0 -upa0 at mainbus0 -central0 at mainbus0 -fhc0 at central0 -fhc* at mainbus0 -psycho* at mainbus0 -pci* at psycho? -schizo* at mainbus0 -schizo* at ssm? -pci* at schizo? -pyro* at mainbus0 -pci* at pyro? -vpci* at mainbus0 -pci* at vpci? -pci* at ppb? -ppb* at pci? -ebus* at mainbus0 -ebus* at pci? -vbus0 at mainbus0 -sbbc* at pci? -cbus* at vbus? - -# CardBus bus support -cardbus* at cardslot? -pcmcia* at cardslot? -cbb* at pci? -cardslot* at cbb? - -ath* at pci? # Atheros AR5k (802.11a/b/g) -ath* at cardbus? # Atheros AR5k (802.11a/b/g) -athn* at pci? # Atheros AR9k (802.11a/g/n) -athn* at cardbus? # Atheros AR9k (802.11a/g/n) -ral* at pci? # Ralink RT2500/RT2501/RT2600 -ral* at cardbus? # Ralink RT2500/RT2501/RT2600 -com* at pcmcia? # PCMCIA modems/serial ports -ep* at pcmcia? # PCMCIA based 3C5xx ethernet -ne* at pcmcia? # PCMCIA based NE2000 ethernet -wi* at pci? # WaveLAN IEEE 802.11DS -wi* at pcmcia? # WaveLAN IEEE 802.11DS - -# PCI Ethernet -hme* at pci? # Sun Happy Meal 10/100 -gem* at pci? # Sun GEM 10/100/Gigabit -cas* at pci? # Sun Cassini 100/Gigabit -ti* at pci? # Alteon Tigon 1Gb ethernet -skc* at pci? # SysKonnect GEnesis 984x -sk* at skc? # each port of above -mskc* at pci? # Marvell Yukon-2 -msk* at mskc? # each port of above -fxp* at pci? # EtherExpress 10/100B ethernet -xl* at pci? # 3C9xx ethernet -xl* at cardbus? # 3C9xx ethernet -pcn* at pci? # AMD PCnet-PCI Ethernet -de* at pci? # DC21X4X-based ethernet -dc* at pci? # 21143, "tulip" clone ethernet -dc* at cardbus? # 21143, "tulip" clone ethernet -ne* at pci? # NE2000-compat ethernet cards -epic* at pci? # SMC EPIC/100 ethernet -em* at pci? # Intel Pro/1000 ethernet -#ixgb* at pci? # Intel Pro/10Gb ethernet -bge* at pci? # Broadcom BCM570x (aka Tigon3) -bnx* at pci? # Broadcom BCM5706/5708 GigE -stge* at pci? # Sundance TC9021 GigE -rl* at pci? # RealTek 81[23]9 ethernet -vr* at pci? # VIA Rhine ethernet -re* at pci? # RealTek 8169/8169S/8110S -re* at cardbus? # RealTek 8169/8169S/8110S -jme* at pci? # JMicron JMC250/JMC260 Ethernet - -auxio* at ebus? -auxio* at sbus? -#com* at ebus? -clock* at sbus? # Mostek clock -clock* at ebus? -clock0 at fhc? -rtc* at ebus? # DS1287/M5819 clock -timer* at mainbus0 # Timer chip - -# Virtual devices for sun4v systems. -vcons0 at vbus? -vrtc0 at vbus? -vrng0 at vbus? -vdsk* at cbus? -vnet* at cbus? - -## Lance Ethernet - AMD7990 +option SUN4US +option SUN4V + +config bsd root on rd0a + +mainbus0 at root +cpu0 at mainbus0 +ssm* at mainbus0 +cpu0 at ssm? +cmp* at mainbus0 +cpu0 at cmp? +core* at cmp? +cpu0 at core? + +sbus* at mainbus0 +upa0 at mainbus0 +central0 at mainbus0 +fhc0 at central0 +fhc* at mainbus0 +psycho* at mainbus0 +pci* at psycho? +schizo* at mainbus0 +schizo* at ssm? +pci* at schizo? +pyro* at mainbus0 +pci* at pyro? +vpci* at mainbus0 +pci* at vpci? +pci* at ppb? +ppb* at pci? +ebus* at mainbus0 +ebus* at pci? +vbus0 at mainbus0 +sbbc* at pci? +cbus* at vbus? + +cardbus* at cardslot? +pcmcia* at cardslot? +cbb* at pci? +cardslot* at cbb? + +ath* at pci? # Atheros AR5k (802.11a/b/g) +ath* at cardbus? # Atheros AR5k (802.11a/b/g) +athn* at pci? # Atheros AR9k (802.11a/g/n) +athn* at cardbus? # Atheros AR9k (802.11a/g/n) +ral* at pci? # Ralink RT2500/RT2501/RT2600 +ral* at cardbus? # Ralink RT2500/RT2501/RT2600 +com* at pcmcia? # PCMCIA modems/serial ports +ep* at pcmcia? # PCMCIA based 3C5xx ethernet +ne* at pcmcia? # PCMCIA based NE2000 ethernet +wi* at pci? # WaveLAN IEEE 802.11DS +wi* at pcmcia? # WaveLAN IEEE 802.11DS + +hme* at pci? # Sun Happy Meal 10/100 +gem* at pci? # Sun GEM 10/100/Gigabit +cas* at pci? # Sun Cassini 100/Gigabit +ti* at pci? # Alteon Tigon 1Gb ethernet +skc* at pci? # SysKonnect GEnesis 984x +sk* at skc? # each port of above +mskc* at pci? # Marvell Yukon-2 +msk* at mskc? # each port of above +fxp* at pci? # EtherExpress 10/100B ethernet +xl* at pci? # 3C9xx ethernet +xl* at cardbus? # 3C9xx ethernet +pcn* at pci? # AMD PCnet-PCI Ethernet +de* at pci? # DC21X4X-based ethernet +dc* at pci? # 21143, "tulip" clone ethernet +dc* at cardbus? # 21143, "tulip" clone ethernet +ne* at pci? # NE2000-compat ethernet cards +epic* at pci? # SMC EPIC/100 ethernet +em* at pci? # Intel Pro/1000 ethernet +bge* at pci? # Broadcom BCM570x (aka Tigon3) +bnx* at pci? # Broadcom BCM5706/5708 GigE +stge* at pci? # Sundance TC9021 GigE +rl* at pci? # RealTek 81[23]9 ethernet +vr* at pci? # VIA Rhine ethernet +re* at pci? # RealTek 8169/8169S/8110S +re* at cardbus? # RealTek 8169/8169S/8110S +jme* at pci? # JMicron JMC250/JMC260 Ethernet + +auxio* at ebus? +auxio* at sbus? +clock* at sbus? # Mostek clock +clock* at ebus? +clock0 at fhc? +rtc* at ebus? # DS1287/M5819 clock +timer* at mainbus0 # Timer chip + +vcons0 at vbus? +vrtc0 at vbus? +vrng0 at vbus? +vdsk* at cbus? +vnet* at cbus? + le* at sbus? ledma* at sbus? le* at ledma? lebuffer* at sbus? le* at lebuffer? -# Quad-ethernet glue device, and sub-devices -qec* at sbus? -qe* at qec? -be* at qec? +qec* at sbus? +qe* at qec? +be* at qec? -hme* at sbus? -ti* at sbus? -gem* at sbus? +hme* at sbus? +ti* at sbus? +gem* at sbus? -pciide* at pci? flags 0x0000 -wd* at pciide? flags 0x0a00 -atapiscsi* at pciide? +pciide* at pci? flags 0x0000 +wd* at pciide? flags 0x0a00 +atapiscsi* at pciide? -# -# Note the flags on the esp entries below, that work around -# deficiencies in the current driver: +# The flags on the esp entries below work around deficiencies in the driver: # bits 0-7: disable disconnect/reselect for the corresponding target # bits 8-15: disable synch negotiation for target [bit-8] # Note: targets 4-7 have disconnect/reselect enabled on the premise # that tape devices normally have one of these targets. Tape # devices should be allowed to disconnect for the SCSI bus # to operate acceptably. -# -dma* at sbus? # SBus -esp* at dma? # SBus -esp* at sbus? -qla* at sbus? -qlw* at sbus? -softraid0 at root # Software RAID - -ahc* at pci? -siop* at pci? -qlw* at pci? -qla* at pci? -option QLE_NOFIRMWARE -qle* at pci? -mpi* at pci? -mpii* at pci? -sili* at pci? -arc* at pci? -jmb* at pci? -ahci* at jmb? -pciide* at jmb? -ahci* at pci? - - -# These entries find devices on all SCSI busses and assign -# unit numers dynamically. -scsibus* at scsi? -sd* at scsibus? # SCSI disks -cd* at scsibus? # SCSI CD-ROMs - -# Media Independent Interface (mii) drivers) -acphy* at mii? # Altima AC101 PHYs -exphy* at mii? # 3Com internal PHYs -bmtphy* at mii? # Broadcom 10/100 PHYs -brgphy* at mii? # Broadcom Gigabit PHYs -eephy* at mii? # Marvell 88E1000 series PHY -xmphy* at mii? # XaQti XMAC-II PHYs -nsphy* at mii? # NS and compatible PHYs -nsphyter* at mii? # NS and compatible PHYs -qsphy* at mii? # Quality Semi QS6612 PHYs -luphy* at mii? # Lucent LU6612 PHY -sqphy* at mii? # Seeq 8x220 PHYs -dcphy* at mii? # Digital clone PHYs -amphy* at mii? # AMD AM79c873 PHYs -icsphy* at mii? # ICS 1890 PHYs -iophy* at mii? # Intel 82553 PHYs -inphy* at mii? # Intel 82555 PHYs -lxtphy* at mii? # Level1 LXT970 PHYs -rlphy* at mii? # RealTek 8139 internal PHYs -urlphy* at mii? # Realtek RTL8150L internal PHY -rgephy* at mii? # Realtek 8169S/8110S PHY -gentbi* at mii? # Generic 1000BASE-X ten-bit PHY -nsgphy* at mii? # NS gigabit PHYs -jmphy* at mii? # JMicron JMP202/JMP211 PHYs -ipgphy* at mii? # IC Plus IP1000A PHYs -ukphy* at mii? # Unknown PHYs - -# PCI USB Controllers -ohci* at pci? # Open Host Controller -ohci* at cardbus? -uhci* at pci? # Universal Host Controller (Intel) -ehci* at pci? # Enhanced Host Controller -ehci* at cardbus? -#xhci* at pci? # eXtensible Host Controller - -# USB bus support -usb* at ohci? -usb* at uhci? -usb* at ehci? -#usb* at xhci? - -# USB devices -uhub* at usb? # USB Hubs -uhub* at uhub? # USB Hubs -uhidev* at uhub? # Human Interface Devices -ukbd* at uhidev? # USB keyboard -wskbd* at ukbd? -umass* at uhub? # USB Mass Storage devices -aue* at uhub? # ADMtek AN986 Pegasus Ethernet -axe* at uhub? # ASIX Electronics AX88172 USB Ethernet -axen* at uhub? # ASIX Electronics AX88179 USB Ethernet -cue* at uhub? # CATC USB-EL1201A based Ethernet -kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet -smsc* at uhub? # SMSC LAN95xx Ethernet -cdce* at uhub? # CDC Ethernet -udav* at uhub? # Davicom DM9601 based Ethernet -mos* at uhub? # MOSCHIP MCS7730/7830 10/100 Ethernet -ural* at uhub? # Ralink RT2500USB -rum* at uhub? # Ralink RT2501USB/RT2601USB -url* at uhub? # Realtek RTL8150L based adapters - -# SAB82532 based serial ports -sab* at ebus? -sabtty* at sab? - -# NS16550 based serial ports -com* at ebus? -comkbd* at ebus? -wskbd* at comkbd? - -# Z8530 based serial ports -zs* at sbus? -zs* at fhc? -zstty* at zs? -zskbd* at zs? -wskbd* at zskbd? - -# i8042 based serial ports (PS/2 ports) -pckbc* at ebus? # controller -pckbd* at pckbc? # ps2 keyboard -wskbd* at pckbd? # generic keyboard layer - -# Framebuffers +dma* at sbus? # SBus +esp* at dma? # SBus +esp* at sbus? +qla* at sbus? +qlw* at sbus? +softraid0 at root + +ahc* at pci? +siop* at pci? +qlw* at pci? +qla* at pci? +option QLE_NOFIRMWARE +qle* at pci? +mpi* at pci? +mpii* at pci? +sili* at pci? +arc* at pci? +jmb* at pci? +ahci* at jmb? +pciide* at jmb? +ahci* at pci? + +scsibus* at scsi? +sd* at scsibus? # SCSI disks +cd* at scsibus? # SCSI CD-ROMs + +acphy* at mii? # Altima AC101 PHYs +exphy* at mii? # 3Com internal PHYs +bmtphy* at mii? # Broadcom 10/100 PHYs +brgphy* at mii? # Broadcom Gigabit PHYs +eephy* at mii? # Marvell 88E1000 series PHY +xmphy* at mii? # XaQti XMAC-II PHYs +nsphy* at mii? # NS and compatible PHYs +nsphyter* at mii? # NS and compatible PHYs +qsphy* at mii? # Quality Semi QS6612 PHYs +luphy* at mii? # Lucent LU6612 PHY +sqphy* at mii? # Seeq 8x220 PHYs +dcphy* at mii? # Digital clone PHYs +amphy* at mii? # AMD AM79c873 PHYs +icsphy* at mii? # ICS 1890 PHYs +iophy* at mii? # Intel 82553 PHYs +inphy* at mii? # Intel 82555 PHYs +lxtphy* at mii? # Level1 LXT970 PHYs +rlphy* at mii? # RealTek 8139 internal PHYs +urlphy* at mii? # Realtek RTL8150L internal PHY +rgephy* at mii? # Realtek 8169S/8110S PHY +gentbi* at mii? # Generic 1000BASE-X ten-bit PHY +nsgphy* at mii? # NS gigabit PHYs +jmphy* at mii? # JMicron JMP202/JMP211 PHYs +ipgphy* at mii? # IC Plus IP1000A PHYs +ukphy* at mii? # Unknown PHYs + +ohci* at pci? +ohci* at cardbus? +uhci* at pci? +ehci* at pci? +ehci* at cardbus? +#xhci* at pci? +usb* at ohci? +usb* at uhci? +usb* at ehci? +#usb* at xhci? + +uhub* at usb? +uhub* at uhub? +uhidev* at uhub? # Human Interface Devices +ukbd* at uhidev? # USB keyboard +wskbd* at ukbd? +umass* at uhub? +aue* at uhub? # ADMtek AN986 Pegasus Ethernet +axe* at uhub? # ASIX Electronics AX88172 USB Ethernet +axen* at uhub? # ASIX Electronics AX88179 USB Ethernet +cue* at uhub? # CATC USB-EL1201A based Ethernet +kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet +smsc* at uhub? # SMSC LAN95xx Ethernet +cdce* at uhub? # CDC Ethernet +udav* at uhub? # Davicom DM9601 based Ethernet +mos* at uhub? # MOSCHIP MCS7730/7830 10/100 Ethernet +ural* at uhub? # Ralink RT2500USB +rum* at uhub? # Ralink RT2501USB/RT2601USB +url* at uhub? # Realtek RTL8150L based adapters + +sab* at ebus? +sabtty* at sab? +com* at ebus? +comkbd* at ebus? +wskbd* at comkbd? + +zs* at sbus? +zs* at fhc? +zstty* at zs? +zskbd* at zs? +wskbd* at zskbd? + +pckbc* at ebus? # controller +pckbd* at pckbc? # ps2 keyboard +wskbd* at pckbd? # generic keyboard layer + agten* at sbus? # Fujitsu AG-10e framebuffer wsdisplay* at agten? bwtwo* at sbus? # bwtwo monochrome framebuffer @@ -314,19 +281,15 @@ wsdisplay* at vigra? zx* at sbus? # Sun Leo (ZX) framebuffer wsdisplay* at zx? -# ``XBox'' SBus Expansion xbox* at sbus? sbus* at xbox? -## PROM console driver -- if all else fails -pcons0 at mainbus0 # PROM console -wsdisplay* at pcons? - -## PROM clock -- if all else failse -prtc0 at mainbus0 +prtc0 at mainbus0 +pcons0 at mainbus0 +wsdisplay* at pcons? -pseudo-device rd 2 # ramdisk -pseudo-device loop 1 # network loopback -pseudo-device bpfilter 1 # packet filter -pseudo-device vlan # IEEE 802.1Q VLAN -pseudo-device bio 1 # ioctl multiplexing device +pseudo-device rd 1 +pseudo-device loop 1 +pseudo-device bpfilter 1 +pseudo-device vlan +pseudo-device bio 1 diff --git a/sys/arch/sparc64/conf/RAMDISKU1 b/sys/arch/sparc64/conf/RAMDISKU1 index 2bf402554bd..9ca27a2ee08 100644 --- a/sys/arch/sparc64/conf/RAMDISKU1 +++ b/sys/arch/sparc64/conf/RAMDISKU1 @@ -1,88 +1,64 @@ -# $OpenBSD: RAMDISKU1,v 1.21 2011/06/29 20:52:09 matthew Exp $ +# $OpenBSD: RAMDISKU1,v 1.22 2014/10/10 05:43:36 deraadt Exp $ -# Machine architecture; required by config(8) machine sparc64 +maxusers 4 -# maxusers means mostly "let's get small" in terms of kernel malloc's -maxusers 2 +option TIMEZONE=0 +option DST=0 +option SMALL_KERNEL +option NO_PROPOLICE +option BOOT_CONFIG option RAMDISK_HOOKS option MINIROOTSIZE=6144 -#option DDB # need this to see what's happening - -option TIMEZONE=0 # time zone to adjust RTC time by -option DST=0 # daylight saving time used by RTC - -option SMALL_KERNEL -option NO_PROPOLICE -option FFS # UFS -#option NFSCLIENT # Network File System client -#option CD9660 # ISO 9660 + Rock Ridge file system -option INET # IP + ICMP + TCP + UDP -option BOOT_CONFIG # add support for boot -c +option FFS +option INET option WSEMUL_SUN # provide sun terminal emulation; required option WSEMUL_NO_VT100 # do not provide vt100 terminal emulation -# Generic swap; second partition of root disk or network. -config bsd root on rd0a - -# Main bus and CPU .. all systems. -mainbus0 at root -cpu0 at mainbus0 +config bsd root on rd0a -# Bus types found on SPARC systems. -sbus* at mainbus0 # Ultra 1 +mainbus0 at root +cpu0 at mainbus0 -clock* at sbus? # Mostek clock -timer* at mainbus0 # Timer chip +sbus* at mainbus0 # Ultra 1 +clock* at sbus? # Mostek clock +timer* at mainbus0 # Timer chip le* at sbus? # Lance Ethernet - AMD7990 ledma* at sbus? le* at ledma? lebuffer* at sbus? le* at lebuffer? - -#qec* at sbus? # Quad-ethernet -#qe* at qec? -#be* at qec? - hme* at sbus? gem* at sbus? -# -# Note the flags on the esp entries below, that work around -# deficiencies in the current driver: +# The flags on the esp entries below work around deficiencies in the driver: # bits 0-7: disable disconnect/reselect for the corresponding target # bits 8-15: disable synch negotiation for target [bit-8] # Note: targets 4-7 have disconnect/reselect enabled on the premise # that tape devices normally have one of these targets. Tape # devices should be allowed to disconnect for the SCSI bus # to operate acceptably. -# -dma* at sbus? # SBus -esp* at dma? # SBus -esp* at sbus? - -# These entries find devices on all SCSI busses and assign -# unit numers dynamically. -scsibus* at scsi? -sd* at scsibus? # SCSI disks -#cd* at scsibus? # SCSI CD-ROMs - -# Media Independent Interface (mii) drivers) -nsphy* at mii? # NS and compatible PHYs -qsphy* at mii? # Quality Semi QS6612 PHYs -ukphy* at mii? # Unknown PHYs - -# Z8530 based serial ports -zs* at sbus? -zstty* at zs? -zskbd* at zs? -wskbd* at zskbd? - -# Framebuffers +dma* at sbus? +esp* at dma? +esp* at sbus? + +scsibus* at scsi? +sd* at scsibus? +#cd* at scsibus? + +nsphy* at mii? # NS and compatible PHYs +qsphy* at mii? # Quality Semi QS6612 PHYs +ukphy* at mii? # Unknown PHYs + +zs* at sbus? +zstty* at zs? +zskbd* at zs? +wskbd* at zskbd? + agten* at sbus? # Fujitsu AG-10e framebuffer wsdisplay* at agten? bwtwo* at sbus? # bwtwo monochrome framebuffer @@ -106,12 +82,10 @@ wsdisplay* at vigra? zx* at sbus? # Sun Leo (ZX) framebuffer wsdisplay* at zx? -# ``XBox'' SBus Expansion xbox* at sbus? sbus* at xbox? -## PROM console driver -- if all else fails -pcons0 at mainbus0 # PROM console +pcons0 at mainbus0 # PROM console -pseudo-device rd 2 # ramdisk -pseudo-device loop 1 # network loopback +pseudo-device rd 1 +pseudo-device loop 1 diff --git a/sys/arch/sparc64/conf/RAMDISKU5 b/sys/arch/sparc64/conf/RAMDISKU5 index a2faaa8c769..53e2ad0c642 100644 --- a/sys/arch/sparc64/conf/RAMDISKU5 +++ b/sys/arch/sparc64/conf/RAMDISKU5 @@ -1,106 +1,83 @@ -# $OpenBSD: RAMDISKU5,v 1.18 2014/04/05 16:33:14 deraadt Exp $ +# $OpenBSD: RAMDISKU5,v 1.19 2014/10/10 05:43:36 deraadt Exp $ -# Machine architecture; required by config(8) machine sparc64 +maxusers 4 -# maxusers means mostly "let's get small" in terms of kernel malloc's -maxusers 2 +option TIMEZONE=0 +option DST=0 + +option SMALL_KERNEL +option NO_PROPOLICE +option BOOT_CONFIG option RAMDISK_HOOKS option MINIROOTSIZE=6144 -#option DDB # need this to see what's happening - -option TIMEZONE=0 # time zone to adjust RTC time by -option DST=0 # daylight saving time used by RTC - -option SMALL_KERNEL -option NO_PROPOLICE -option FFS # UFS -#option NFSCLIENT # Network File System client -#option CD9660 # ISO 9660 + Rock Ridge file system -option INET # IP + ICMP + TCP + UDP -option BOOT_CONFIG # add support for boot -c +option FFS +option INET option WSEMUL_SUN # provide sun terminal emulation; required option WSEMUL_NO_VT100 # do not provide vt100 terminal emulation -# Generic swap; second partition of root disk or network. -config bsd root on rd0a - -# Main bus and CPU .. all systems. -mainbus0 at root -cpu0 at mainbus0 - -# Bus types found on SPARC systems. -upa0 at mainbus0 -schizo* at mainbus0 -pci* at schizo? -psycho* at mainbus0 -pci* at psycho? # Ultra 5 -pci* at ppb? -ppb* at pci? -ebus* at pci? - -# PCI Ethernet -hme* at pci? -gem* at pci? - -auxio* at ebus? -clock* at ebus? # Mostek clock - -## PROM console driver -- if all else fails -pcons0 at mainbus0 # PROM console - -timer* at mainbus0 # Timer chip (some systems) - -pciide* at pci? flags 0x0000 -wd* at pciide? flags 0x0a00 -atapiscsi* at pciide? - -siop* at pci? - -# These entries find devices on all SCSI busses and assign -# unit numers dynamically. -scsibus* at scsi? -sd* at scsibus? # SCSI disks -#cd* at scsibus? # SCSI CD-ROMs - -# Media Independent Interface (mii) drivers) -nsphy* at mii? # NS and compatible PHYs -qsphy* at mii? # Quality Semi QS6612 PHYs -ukphy* at mii? # Unknown PHYs - -# PCI USB Controllers -ohci* at pci ? -uhci* at pci? - -# USB bus support -usb* at ohci? -usb* at uhci? - -# USB devices -uhub* at usb? # USB Hubs -uhub* at uhub? # USB Hubs -uhidev* at uhub? # Human Interface Devices -ukbd* at uhidev? # USB Keyboard -wskbd* at ukbd? - -# SAB82532 based serial ports -sab* at ebus? -sabtty* at sab? - -# NS16550 based serial ports -com* at ebus? -comkbd* at ebus? -wskbd* at comkbd? - -# i8042 based serial ports (PS/2 ports) -pckbc* at ebus? # controller -pckbd* at pckbc? # ps2 keyboard -wskbd* at pckbd? # generic keyboard layer - -# Framebuffers +config bsd root on rd0a + +mainbus0 at root +cpu0 at mainbus0 + +upa0 at mainbus0 +schizo* at mainbus0 +pci* at schizo? +psycho* at mainbus0 +pci* at psycho? # Ultra 5 +pci* at ppb? +ppb* at pci? +ebus* at pci? + +hme* at pci? +gem* at pci? + +auxio* at ebus? +clock* at ebus? + +pcons0 at mainbus0 # PROM console + +timer* at mainbus0 # Timer chip (some systems) + +pciide* at pci? flags 0x0000 +wd* at pciide? flags 0x0a00 +atapiscsi* at pciide? + +siop* at pci? + +scsibus* at scsi? +sd* at scsibus? +#cd* at scsibus? + +nsphy* at mii? # NS and compatible PHYs +qsphy* at mii? # Quality Semi QS6612 PHYs +ukphy* at mii? # Unknown PHYs + +ohci* at pci ? +uhci* at pci? +usb* at ohci? +usb* at uhci? + +uhub* at usb? +uhub* at uhub? +uhidev* at uhub? # Human Interface Devices +ukbd* at uhidev? # USB Keyboard +wskbd* at ukbd? + +sab* at ebus? +sabtty* at sab? +com* at ebus? +comkbd* at ebus? +wskbd* at comkbd? + +pckbc* at ebus? # controller +pckbd* at pckbc? # ps2 keyboard +wskbd* at pckbd? # generic keyboard layer + creator* at upa0 # Creator3D/Elite3D framebuffers wsdisplay* at creator? gfxp* at pci? # PGX32 framebuffer @@ -112,5 +89,5 @@ wsdisplay* at raptor? vgafb* at pci? wsdisplay* at vgafb? -pseudo-device rd 2 # ramdisk -pseudo-device loop 1 # network loopback +pseudo-device rd 1 +pseudo-device loop 1 diff --git a/sys/arch/vax/conf/RAMDISK b/sys/arch/vax/conf/RAMDISK index 5968620f658..a7448b88e5f 100644 --- a/sys/arch/vax/conf/RAMDISK +++ b/sys/arch/vax/conf/RAMDISK @@ -1,44 +1,41 @@ -# $OpenBSD: RAMDISK,v 1.36 2011/07/06 18:32:59 miod Exp $ +# $OpenBSD: RAMDISK,v 1.37 2014/10/10 05:43:36 deraadt Exp $ -machine vax # machine type +machine vax +maxusers 4 -option RAMDISK_HOOKS -option MINIROOTSIZE=3072 - -# Here are all different supported CPU types listed. -# One of these is required. -option VAX630 # MV II -option VAX650 # MV III, 3300, 3600, 3800, 3900 -option VAX660 # VAX 4000 200 -option VAX670 # VAX 4000 300 -option VAX680 # VAX 4000 {4,5,6,7}0{0,5}{,A} -option VAX410 # VS 2000, 3100/{30,} -option VAX43 # VS 3100/76 -option VAX46 # VS 4000/60 -option VAX48 # VS 4000 VLC -option VAX49 # VS 4000/90 -option VAX53 # VAX 4000/10{0,5,6} -option VAX60 # VS 3[58][24]0 -option VXT # VXT2000 and VXT2000+ - -maxusers 8 # estimated number of users -option TIMEZONE=0 # time zone to adjust RTC time by -option DST=0 # daylight saving time used by RTC - -option FFS # UFS +option TIMEZONE=0 +option DST=0 -option NFSCLIENT # Network File System client -option CD9660 # ISO 9660 + Rock Ridge file system -#option MSDOSFS # MS-DOS file system +option SMALL_KERNEL +option NO_PROPOLICE +option BOOT_CONFIG -option INET # IP + ICMP + TCP + UDP -option INET6 # IPv6 (needs INET) - -option BOOT_CONFIG # boot-time kernel config +option RAMDISK_HOOKS +option MINIROOTSIZE=3072 -config bsd root on rd0a swap on rd0b # and sd0b +option FFS +option NFSCLIENT +option CD9660 +option INET +option INET6 -option INSN_EMULATE # CPU lacks some hardware instructions. +# Here are all different supported CPU types listed. +option VAX630 # MV II +option VAX650 # MV III, 3300, 3600, 3800, 3900 +option VAX660 # VAX 4000 200 +option VAX670 # VAX 4000 300 +option VAX680 # VAX 4000 {4,5,6,7}0{0,5}{,A} +option VAX410 # VS 2000, 3100/{30,} +option VAX43 # VS 3100/76 +option VAX46 # VS 4000/60 +option VAX48 # VS 4000 VLC +option VAX49 # VS 4000/90 +option VAX53 # VAX 4000/10{0,5,6} +option VAX60 # VS 3[58][24]0 +option VXT # VXT2000 and VXT2000+ +option INSN_EMULATE # CPU lacks some hardware instructions. + +config bsd root on rd0a swap on rd0b mainbus0 at root @@ -64,13 +61,11 @@ lcg0 at vsbus0 csr 0x20100000 # VS4000/60 (or VLC) frame buffer lcspx0 at vsbus0 csr 0x39302000 # VS4000/90 frame buffer hd* at hdc0 drive? # RD5x disks -#ry* at hdc0 drive? # RX floppies # Ibus, the internal bus on most Microvaxen uba0 at ibus0 # Qbus adapter ze0 at ibus0 # SGEC on-board ethernet le0 at ibus0 # LANCE ethernet -#shac0 at ibus0 # DSSI controller # M-bus found on VS 3[58][24]0 fwio* at mbus0 mid ? # I/O module @@ -88,17 +83,12 @@ ze0 at vxtbus0 # SGEC on-board ethernet qsc0 at vxtbus0 # serial ports lcspx0 at vxtbus0 # color frame buffer -# Devices on Unibus/Qbus adapters uda0 at uba? csr 0172150 # UDA50/RQDX? uda1 at uba? csr 0160334 mtc0 at uba? csr 0174500 # Tape MSCP ctlr -#de0 at uba? csr 0174510 # DELUA/DEUNA qe0 at uba? csr 0174440 # DEQNA/DELQA -#dhu0 at uba? csr 0160440 # DHU-11 dz0 at uba? csr 0160100 # DZ-11 -#dl0 at uba? csr 0176500 # DL-11 -# MSCP devices mscpbus* at uda? mscpbus* at mtc? @@ -106,18 +96,11 @@ ra* at mscpbus? drive? # MSCP disk rx* at mscpbus? drive? # MSCP floppy mt* at mscpbus? drive? # MSCP tape -# SCSI devices - scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? -#ch* at scsibus? -#safte* at scsibus? -#ses* at scsibus? -#uk* at scsibus? -# Workstation console wsdisplay* at gpx? wsdisplay* at lcg? wsdisplay* at lcspx? @@ -127,11 +110,7 @@ wsdisplay* at smg? lkkbd0 at dz0 line 0 lkkbd0 at qsc0 line 2 wskbd* at lkkbd? -#lkms0 at dz0 line 1 -#lkms0 at qsc0 line 3 -#wsmouse* at lkms? - -pseudo-device loop 1 # network loopback -pseudo-device bpfilter 1 # packet filter -pseudo-device rd 1 # ramdisk +pseudo-device loop 1 +pseudo-device bpfilter 1 +pseudo-device rd 1 diff --git a/sys/arch/zaurus/conf/RAMDISK b/sys/arch/zaurus/conf/RAMDISK index a4b721ee2b0..984e6a1df1f 100644 --- a/sys/arch/zaurus/conf/RAMDISK +++ b/sys/arch/zaurus/conf/RAMDISK @@ -1,82 +1,67 @@ -# $OpenBSD: RAMDISK,v 1.50 2014/08/22 20:03:56 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.51 2014/10/10 05:43:36 deraadt Exp $ -machine zaurus arm +machine zaurus arm +maxusers 4 -options TIMEZONE=0 # time zone to adjust RTC time by -options DST=0 # daylight saving time used by RTC -options FFS # UFS -options CD9660 # ISO 9660 + Rock Ridge file system -options MSDOSFS # MS-DOS file system -options INET # IP + ICMP + TCP + UDP -options INET6 # IPv6 (needs INET) -options DDB # kernel debugger -options EXT2FS # Second Extended Filesystem -options CRYPTO # Cryptographic framework +option TIMEZONE=0 +option DST=0 +option SMALL_KERNEL +option NO_PROPOLICE +option BOOT_CONFIG -options ARM32 -options PXAGPIO_HAS_GPION_INTRS +option MINIROOTSIZE=5120 +option RAMDISK_HOOKS -makeoptions KERNEL_BASE_PHYS="0xa0200000" -makeoptions KERNEL_BASE_VIRT="0xc0200000" +option FFS +option CD9660 +option MSDOSFS +option INET +option INET6 +option EXT2FS +option CRYPTO -# estimated number of users +option ARM32 +option PXAGPIO_HAS_GPION_INTRS -maxusers 32 +makeoptions KERNEL_BASE_PHYS="0xa0200000" +makeoptions KERNEL_BASE_VIRT="0xc0200000" -# CPU options -options CPU_XSCALE_PXA2X0 # Support the XScale core -#options XSCALE_CACHE_WRITE_THROUGH -options XSCALE_CACHE_WRITE_BACK +option CPU_XSCALE_PXA2X0 +#option XSCALE_CACHE_WRITE_THROUGH +option XSCALE_CACHE_WRITE_BACK makeoptions CPUFLAGS="-mcpu=xscale" -#option WSDISPLAY_COMPAT_USL # VT handling -#option WSDISPLAY_COMPAT_RAWKBD # provide raw scancodes; needed for X11 -#option WSDISPLAY_DEFAULTSCREENS=2 # initial number of text consoles -#option WSDISPLAY_COMPAT_PCVT # emulate some ioctls; needed for X11 - -config bsd root on rd0a swap on rd0b +config bsd root on rd0a swap on rd0b -# The main bus device mainbus0 at root cpu0 at mainbus? pxaip0 at mainbus? - -pxaintc0 at pxaip? # interrupt controller -pxagpio0 at pxaip? # GPIO +pxaintc0 at pxaip? # interrupt controller +pxagpio0 at pxaip? scoop0 at pxaip? scoop1 at pxaip? pxaost0 at pxaip? addr 0x40a00000 size 0x20 -# touch screen -zts0 at pxaip? +lcd0 at pxaip? +wsdisplay* at lcd? console ? +zssp0 at pxaip? # ADC, touch screen, backlight +zts0 at pxaip? # touch screen wsmouse* at zts? mux 0 - -# keyboard zkbd0 at pxaip? wskbd* at zkbd? mux 1 - -# USB controllers pxaudc0 at pxaip? # USB Device Controller -ohci0 at pxaip? # Open Host Controller -# USB function support +ohci0 at pxaip? usbf* at pxaudc? # USB logical device cdcef* at usbf? # CDC ethernet function - -# USB bus support usb* at ohci? -uhub* at usb? # USB Root Hub -uhub* at uhub? # USB Hubs -# USB devices +uhub* at usb? +uhub* at uhub? uhidev* at uhub? uhid* at uhidev? # USB Generic HID devices ukbd* at uhidev? # USB HID Keyboard devices wskbd* at ukbd? mux 1 -#ums* at uhub? # USB Mice -#wsmouse* at ums? mux 0 -#ulpt* at uhub? # USB Printer -#atu* at uhub? # Atmel AT76C50x based 802.11b aue* at uhub? # ADMtek AN986 Pegasus Ethernet axe* at uhub? # ASIX Electronics AX88172 USB Ethernet axen* at uhub? # ASIX Electronics AX88179 USB Ethernet @@ -89,85 +74,54 @@ ural* at uhub? # Ralink RT2500 url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS upl* at uhub? # Prolific PL2301/PL2302 host-to-host -ugl* at uhub? # Genesys Logic GL620A-USB host-to-host -#ugen* at uhub? # USB Generic driver -umass* at uhub? # USB Mass Storage devices +ugl* at uhub? # Genesys Logic GL620USB-A host-to-host +umass* at uhub? -# SD/MMC support pxammc0 at pxaip? # MMC/SD/SDIO controller sdmmc* at pxammc? # SD/MMC bus -softraid0 at root # Software RAID +softraid0 at root scsibus* at scsi? sd* at scsibus? -#st* at scsibus? cd* at scsibus? -#ch* at scsibus? -#uk* at scsibus? - -# integrated 16550 UARTs -options COM_PXA2X0 -com0 at pxaip? addr 0x40100000 intr 22 # Full Function UART -com1 at pxaip? addr 0x40200000 intr 21 # BlueTooth UART -com2 at pxaip? addr 0x40700000 intr 20 # Standard UART (for IrDA) -#aupxa0 at pxaip? # AC97 interface +option COM_PXA2X0 +com0 at pxaip? addr 0x40100000 intr 22 # Full Function UART +com1 at pxaip? addr 0x40200000 intr 21 # BlueTooth UART +com2 at pxaip? addr 0x40700000 intr 20 # Standard UART (for IrDA) -# CF (pcmcia) support pxapcic0 at pxaip? pcmcia* at pxapcic? wi* at pcmcia? ne* at pcmcia? wdc* at pcmcia? - -# IDE hard drives wd* at wdc? flags 0x0000 -# PHY -exphy* at mii? # 3Com internal PHYs -inphy* at mii? # Intel 82555 PHYs -iophy* at mii? # Intel 82553 PHYs -icsphy* at mii? # ICS 1890 PHYs -lxtphy* at mii? # Level1 LXT970 PHYs -nsphy* at mii? # NS and compatible PHYs -nsphyter* at mii? # NS and compatible PHYs -qsphy* at mii? # Quality Semi QS6612 PHYs -sqphy* at mii? # Seeq 8x220 PHYs -rlphy* at mii? # RealTek 8139 internal PHYs -mtdphy* at mii? # Myson MTD972 PHYs -#dcphy* at mii? # Digital Clone PHYs -acphy* at mii? # Altima AC101 PHYs -amphy* at mii? # AMD 79C873 PHYs -tqphy* at mii? # TDK 78Q212x PHYs -bmtphy* at mii? # Broadcom 10/100 PHYs -#brgphy* at mii? # Broadcom Gigabit PHYs -eephy* at mii? # Marvell 88E1000 series PHY -#xmphy* at mii? # XaQti XMAC-II PHYs -nsgphy* at mii? # NS gigabit PHYs -urlphy* at mii? # Realtek RTL8150L internal PHY -rgephy* at mii? # Realtek 8169S/8110S PHY -#ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY -ukphy* at mii? # "unknown" PHYs - -# LCD -lcd0 at pxaip? -wsdisplay* at lcd? console ? - -# Dedicated SSP unit for ADC, touch screen, and backlight -zssp0 at pxaip? - -# APM emulation -apm0 at pxaip? - -# Pseudo-Devices -pseudo-device wsmux 2 # mouse & keyboard multiplexor -pseudo-device loop 1 # network loopback -pseudo-device bpfilter 1 # packet filter -pseudo-device rd 1 # ram disk -pseudo-device bio 1 # ioctl multiplexing device - -options BOOT_CONFIG # boot-time kernel config - -# RAMDISK stuff -options MINIROOTSIZE=5120 -options RAMDISK_HOOKS +exphy* at mii? # 3Com internal PHYs +inphy* at mii? # Intel 82555 PHYs +iophy* at mii? # Intel 82553 PHYs +icsphy* at mii? # ICS 1890 PHYs +lxtphy* at mii? # Level1 LXT970 PHYs +nsphy* at mii? # NS and compatible PHYs +nsphyter* at mii? # NS and compatible PHYs +qsphy* at mii? # Quality Semi QS6612 PHYs +sqphy* at mii? # Seeq 8x220 PHYs +rlphy* at mii? # RealTek 8139 internal PHYs +mtdphy* at mii? # Myson MTD972 PHYs +acphy* at mii? # Altima AC101 PHYs +amphy* at mii? # AMD 79C873 PHYs +tqphy* at mii? # TDK 78Q212x PHYs +bmtphy* at mii? # Broadcom 10/100 PHYs +eephy* at mii? # Marvell 88E1000 series PHY +nsgphy* at mii? # NS gigabit PHYs +urlphy* at mii? # Realtek RTL8150L internal PHY +rgephy* at mii? # Realtek 8169S/8110S PHY +ukphy* at mii? # "unknown" PHYs + +apm0 at pxaip? # APM emulation + +pseudo-device wsmux 2 +pseudo-device loop 1 +pseudo-device bpfilter 1 +pseudo-device rd 1 +pseudo-device bio 1 |