summaryrefslogtreecommitdiff
path: root/sys/arch/alpha
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/alpha')
-rw-r--r--sys/arch/alpha/conf/RAMDISK211
-rw-r--r--sys/arch/alpha/conf/RAMDISKB195
-rw-r--r--sys/arch/alpha/conf/RAMDISKBIG480
-rw-r--r--sys/arch/alpha/conf/RAMDISKC189
4 files changed, 397 insertions, 678 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