diff options
Diffstat (limited to 'sys/arch/alpha/conf')
-rw-r--r-- | sys/arch/alpha/conf/ALPHA | 42 | ||||
-rw-r--r-- | sys/arch/alpha/conf/BUNNY | 24 | ||||
-rw-r--r-- | sys/arch/alpha/conf/GENERIC | 36 | ||||
-rw-r--r-- | sys/arch/alpha/conf/GENERIC.PROF | 39 | ||||
-rw-r--r-- | sys/arch/alpha/conf/JURA | 10 | ||||
-rw-r--r-- | sys/arch/alpha/conf/Makefile.alpha | 5 | ||||
-rw-r--r-- | sys/arch/alpha/conf/NOSY | 5 | ||||
-rw-r--r-- | sys/arch/alpha/conf/OPAL | 13 | ||||
-rw-r--r-- | sys/arch/alpha/conf/RAMDISK | 38 | ||||
-rw-r--r-- | sys/arch/alpha/conf/files.alpha | 74 | ||||
-rw-r--r-- | sys/arch/alpha/conf/std.alpha | 20 |
11 files changed, 175 insertions, 131 deletions
diff --git a/sys/arch/alpha/conf/ALPHA b/sys/arch/alpha/conf/ALPHA index c02d1012167..2c396e97ff5 100644 --- a/sys/arch/alpha/conf/ALPHA +++ b/sys/arch/alpha/conf/ALPHA @@ -1,5 +1,5 @@ -# $OpenBSD: ALPHA,v 1.8 1996/10/30 22:38:37 niklas Exp $ -# $NetBSD: ALPHA,v 1.24 1996/09/27 17:08:32 cgd Exp $ +# $OpenBSD: ALPHA,v 1.9 1997/01/24 19:56:53 niklas Exp $ +# $NetBSD: ALPHA,v 1.30 1996/12/03 17:25:27 cgd Exp $ # # Alpha kernel with all the options you'd want, and more. @@ -13,6 +13,7 @@ options DEC_3000_300 # Pelican etc: 3000/300* options DEC_2100_A50 # Avanti etc: AlphaStation 400, 200, etc. options DEC_KN20AA # KN20AA: AlphaStation 600 options DEC_AXPPCI_33 # NoName: AXPpci33, etc. +options DEC_EB164 # EB164: AlphaPC 164 #options DEC_2000_300 # "Jensen": 2000/300 (DECpc AXP 150) # needs to be set per system @@ -20,7 +21,6 @@ options TIMEZONE="5*60" # Minutes west of GMT (for param.c) options DST=1 # Daylight savings rules (for param.c) # Standard system options -options SWAPPAGER, DEVPAGER # Paging (mandatory) options DEBUG, DIAGNOSTIC # Extra kernel debugging options KTRACE # System call tracing support @@ -83,6 +83,7 @@ options LKM # Misc. options options EISAVERBOSE # recognize "unknown" EISA devices +#options EXTENT_DEBUG # extent alloc/dealloc code debugging options FIX_UNALIGNED_VAX_FP # fix unaligned VAX FP loads & stores options PCIVERBOSE # recognize "unknown" PCI devices options TCVERBOSE # recognize "unknown" TC devices @@ -102,8 +103,8 @@ tcasic* at mainbus0 tc* at tcasic? # TurboChannel devices -ioasic0 at tc? slot ? offset ? -mcclock0 at ioasic? offset ? +ioasic* at tc? slot ? offset ? +mcclock* at ioasic? offset ? le* at ioasic? offset ? scc0 at ioasic? offset ? scc1 at ioasic? offset ? @@ -135,7 +136,7 @@ fpa* at pci? dev ? function ? # DEC DEFPA FDDI cards le* at pci? dev ? function ? # PCI LANCE Ethernet (untested) ncr* at pci? dev ? function ? # NCR 53c8xx SCSI pceb* at pci? dev ? function ? # Intel PCI-EISA brige -pcivga* at pci? dev ? function ? # PCI VGA graphics +vga* at pci? dev ? function ? # PCI VGA graphics ppb* at pci? dev ? function ? # PCI-PCI bridges sio* at pci? dev ? function ? # Intel PCI-ISA bridge tga* at pci? dev ? function ? # DEC ZLXp-E[123] graphics @@ -146,13 +147,15 @@ eisa* at pceb? isa* at sio? # ISA devices -mcclock0 at isa? port 0x70 -pckbd0 at isa? port 0x60 irq 1 # PC-ish ISA keyboard -pms0 at isa? port 0x60 irq 12 # PS/2 auxiliary -com0 at isa? port 0x3f8 irq 4 # standard serial ports -com1 at isa? port 0x2f8 irq 3 -lpt0 at isa? port 0x3bc irq 7 # standard parallel port -#wss0 at isa? port 0x530 irq 9 drq 0 # Windows Sound System +mcclock* at isa? port 0x70 +pcppi* at isa? # PC prog. periph. interface +pckbd* at pcppi? # PC keyboard (kbd port) +pms* at pcppi? # 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 +#wss* at isa? port 0x530 irq 9 drq 0 # Windows Sound System # EISA devices fea* at eisa? slot ? # DEC DEFEA FDDI cards @@ -162,13 +165,16 @@ scsibus* at esp? scsibus* at ncr? # SCSI devices -sd* at scsibus? target ? lun ? -st* at scsibus? target ? lun ? -cd* at scsibus? target ? lun ? +cd* at scsibus? target ? lun ? # SCSI CD-ROM drives +ch* at scsibus? target ? lun ? # SCSI autochangers +sd* at scsibus? target ? lun ? # SCSI disk drives +ss* at scsibus? target ? lun ? # SCSI scanners +st* at scsibus? target ? lun ? # SCSI tape drives +uk* at scsibus? target ? lun ? # SCSI unknown # Workstation Console attachments wscons* at cfb? -wscons* at pcivga? +wscons* at vga? wscons* at sfb? wscons* at tga? @@ -176,8 +182,8 @@ pseudo-device bpfilter 16 pseudo-device loop pseudo-device ppp 4 pseudo-device pty 64 +pseudo-device rd 1 pseudo-device sl 4 pseudo-device strip 4 pseudo-device tun 4 pseudo-device vnd 4 -pseudo-device rd 1 diff --git a/sys/arch/alpha/conf/BUNNY b/sys/arch/alpha/conf/BUNNY index 1ba7650e2ee..048560029a7 100644 --- a/sys/arch/alpha/conf/BUNNY +++ b/sys/arch/alpha/conf/BUNNY @@ -1,5 +1,5 @@ -# $OpenBSD: BUNNY,v 1.7 1996/10/30 22:38:38 niklas Exp $ -# $NetBSD: BUNNY,v 1.9 1996/09/27 17:08:35 cgd Exp $ +# $OpenBSD: BUNNY,v 1.8 1997/01/24 19:56:54 niklas Exp $ +# $NetBSD: BUNNY,v 1.12 1996/11/25 04:16:15 cgd Exp $ # # Kernel for bunnahabhain.pdl.cs.cmu.edu. # @@ -21,7 +21,6 @@ options TIMEZONE="5*60" # Minutes west of GMT (for param.c) options DST=1 # Daylight savings rules (for param.c) # Standard system options -options SWAPPAGER, DEVPAGER # Paging (mandatory) options DEBUG, DIAGNOSTIC # Extra kernel debugging options KTRACE # System call tracing support @@ -68,7 +67,7 @@ pci* at apecs? # PCI devices de* at pci? ncr* at pci? -pcivga* at pci? +vga* at pci? sio* at pci? tga* at pci? @@ -76,13 +75,14 @@ tga* at pci? isa* at sio? # ISA devices -mcclock0 at isa? port 0x70 -pckbd0 at isa? port 0x60 irq 1 # PC-ish ISA keyboard -pms0 at isa? port 0x60 irq 12 # PS/2 auxiliary -com0 at isa? port 0x3f8 irq 4 # standard serial ports -com1 at isa? port 0x2f8 irq 3 -lpt0 at isa? port 0x3bc irq 7 # standard parallel port -#wss0 at isa? port 0x530 irq 9 drq 0 # Windows Sound System +mcclock* at isa? port 0x70 +pcppi* at isa? # PC prog. periph. interface +pckbd* at pcppi? # PC keyboard (kbd port) +pms* at pcppi? # 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 +#wss* at isa? port 0x530 irq 9 drq 0 # Windows Sound System # SCSI bus support scsibus* at ncr? @@ -93,7 +93,7 @@ st* at scsibus? target ? lun ? cd* at scsibus? target ? lun ? # Workstation Console attachments -wscons* at pcivga? +wscons* at vga? wscons* at tga? pseudo-device bpfilter 16 diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC index c2728c4f66b..77c97cbd6bb 100644 --- a/sys/arch/alpha/conf/GENERIC +++ b/sys/arch/alpha/conf/GENERIC @@ -1,5 +1,5 @@ -# $OpenBSD: GENERIC,v 1.11 1996/12/08 00:20:20 niklas Exp $ -# $NetBSD: GENERIC,v 1.24 1996/09/27 17:08:32 cgd Exp $ +# $OpenBSD: GENERIC,v 1.12 1997/01/24 19:56:55 niklas 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. @@ -13,6 +13,7 @@ options DEC_3000_300 # Pelican etc: 3000/300* options DEC_2100_A50 # Avanti etc: AlphaStation 400, 200, etc. options DEC_KN20AA # KN20AA: AlphaStation 600 options DEC_AXPPCI_33 # NoName: AXPpci33, etc. +options DEC_EB164 # EB164: AlphaPC 164 #options DEC_2000_300 # "Jensen": 2000/300 (DECpc AXP 150) # needs to be set per system @@ -20,7 +21,6 @@ options TIMEZONE="5*60" # Minutes west of GMT (for param.c) options DST=1 # Daylight savings rules (for param.c) # Standard system options -options SWAPPAGER, DEVPAGER # Paging (mandatory) options DEBUG, DIAGNOSTIC # Extra kernel debugging options KTRACE # System call tracing support @@ -72,8 +72,8 @@ tcasic* at mainbus0 tc* at tcasic? # TurboChannel devices -ioasic0 at tc? slot ? offset ? -mcclock0 at ioasic? offset ? +ioasic* at tc? slot ? offset ? +mcclock* at ioasic? offset ? le* at ioasic? offset ? scc0 at ioasic? offset ? scc1 at ioasic? offset ? @@ -105,7 +105,7 @@ fpa* at pci? dev ? function ? # DEC DEFPA FDDI cards le* at pci? dev ? function ? # PCI LANCE Ethernet (untested) ncr* at pci? dev ? function ? # NCR 53c8xx SCSI pceb* at pci? dev ? function ? # Intel PCI-EISA brige -pcivga* at pci? dev ? function ? # PCI VGA graphics +vga* at pci? dev ? function ? # PCI VGA graphics ppb* at pci? dev ? function ? # PCI-PCI bridges sio* at pci? dev ? function ? # Intel PCI-ISA bridge tga* at pci? dev ? function ? # DEC ZLXp-E[123] graphics @@ -116,13 +116,15 @@ eisa* at pceb? isa* at sio? # ISA devices -mcclock0 at isa? port 0x70 -pckbd0 at isa? port 0x60 irq 1 # PC-ish ISA keyboard -pms0 at isa? port 0x60 irq 12 # PS/2 auxiliary -com0 at isa? port 0x3f8 irq 4 # standard serial ports -com1 at isa? port 0x2f8 irq 3 -lpt0 at isa? port 0x3bc irq 7 # standard parallel port -#wss0 at isa? port 0x530 irq 9 drq 0 # Windows Sound System +mcclock* at isa? port 0x70 +pcppi* at isa? # PC prog. periph. interface +pckbd* at pcppi? # PC keyboard (kbd port) +pms* at pcppi? # 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 +#wss* at isa? port 0x530 irq 9 drq 0 # Windows Sound System # EISA devices fea* at eisa? slot ? # DEC DEFEA FDDI cards @@ -132,21 +134,21 @@ scsibus* at esp? scsibus* at ncr? # SCSI devices -sd* at scsibus? target ? lun ? -st* at scsibus? target ? lun ? cd* at scsibus? target ? lun ? +sd* at scsibus? target ? lun ? ss* at scsibus? target ? lun ? +st* at scsibus? target ? lun ? uk* at scsibus? target ? lun ? # Workstation Console attachments wscons* at cfb? -wscons* at pcivga? +wscons* at vga? wscons* at sfb? wscons* at tga? pseudo-device bpfilter 16 pseudo-device loop pseudo-device pty 64 +pseudo-device rd 1 pseudo-device sl 4 pseudo-device vnd 4 -pseudo-device rd 1 diff --git a/sys/arch/alpha/conf/GENERIC.PROF b/sys/arch/alpha/conf/GENERIC.PROF index 5de20fc93c8..d0af501b6ca 100644 --- a/sys/arch/alpha/conf/GENERIC.PROF +++ b/sys/arch/alpha/conf/GENERIC.PROF @@ -1,5 +1,5 @@ -# $OpenBSD: GENERIC.PROF,v 1.1 1996/10/30 22:38:39 niklas Exp $ -# $NetBSD: GENERIC.PROF,v 1.4 1996/09/27 17:08:33 cgd Exp $ +# $OpenBSD: GENERIC.PROF,v 1.2 1997/01/24 19:56:56 niklas Exp $ +# $NetBSD: GENERIC.PROF,v 1.10 1996/12/03 17:25:31 cgd Exp $ # # Generic Alpha kernel. Enough to get booted, etc., but not much more. @@ -17,6 +17,7 @@ options DEC_3000_300 # Pelican etc: 3000/300* options DEC_2100_A50 # Avanti etc: AlphaStation 400, 200, etc. options DEC_KN20AA # KN20AA: AlphaStation 600 options DEC_AXPPCI_33 # NoName: AXPpci33, etc. +options DEC_EB164 # EB164: AlphaPC 164 #options DEC_2000_300 # "Jensen": 2000/300 (DECpc AXP 150) # needs to be set per system @@ -24,7 +25,6 @@ options TIMEZONE="5*60" # Minutes west of GMT (for param.c) options DST=1 # Daylight savings rules (for param.c) # Standard system options -options SWAPPAGER, DEVPAGER # Paging (mandatory) options DEBUG, DIAGNOSTIC # Extra kernel debugging options KTRACE # System call tracing support @@ -76,8 +76,8 @@ tcasic* at mainbus0 tc* at tcasic? # TurboChannel devices -ioasic0 at tc? slot ? offset ? -mcclock0 at ioasic? offset ? +ioasic* at tc? slot ? offset ? +mcclock* at ioasic? offset ? le* at ioasic? offset ? scc0 at ioasic? offset ? scc1 at ioasic? offset ? @@ -109,7 +109,7 @@ fpa* at pci? dev ? function ? # DEC DEFPA FDDI cards le* at pci? dev ? function ? # PCI LANCE Ethernet (untested) ncr* at pci? dev ? function ? # NCR 53c8xx SCSI pceb* at pci? dev ? function ? # Intel PCI-EISA brige -pcivga* at pci? dev ? function ? # PCI VGA graphics +vga* at pci? dev ? function ? # PCI VGA graphics ppb* at pci? dev ? function ? # PCI-PCI bridges sio* at pci? dev ? function ? # Intel PCI-ISA bridge tga* at pci? dev ? function ? # DEC ZLXp-E[123] graphics @@ -120,13 +120,15 @@ eisa* at pceb? isa* at sio? # ISA devices -mcclock0 at isa? port 0x70 -pckbd0 at isa? port 0x60 irq 1 # PC-ish ISA keyboard -pms0 at isa? port 0x60 irq 12 # PS/2 auxiliary -com0 at isa? port 0x3f8 irq 4 # standard serial ports -com1 at isa? port 0x2f8 irq 3 -lpt0 at isa? port 0x3bc irq 7 # standard parallel port -#wss0 at isa? port 0x530 irq 9 drq 0 # Windows Sound System +mcclock* at isa? port 0x70 +pcppi* at isa? # PC prog. periph. interface +pckbd* at pcppi? # PC keyboard (kbd port) +pms* at pcppi? # 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 +#wss* at isa? port 0x530 irq 9 drq 0 # Windows Sound System # EISA devices fea* at eisa? slot ? # DEC DEFEA FDDI cards @@ -136,18 +138,21 @@ scsibus* at esp? scsibus* at ncr? # SCSI devices -sd* at scsibus? target ? lun ? -st* at scsibus? target ? lun ? -cd* at scsibus? target ? lun ? +cd* at scsibus? target ? lun ? # SCSI CD-ROM drives +sd* at scsibus? target ? lun ? # SCSI disk drives +ss* at scsibus? target ? lun ? +st* at scsibus? target ? lun ? # SCSI tape drives +uk* at scsibus? target ? lun ? # Workstation Console attachments wscons* at cfb? -wscons* at pcivga? +wscons* at vga? wscons* at sfb? wscons* at tga? pseudo-device bpfilter 16 pseudo-device loop pseudo-device pty 64 +pseudo-device rd 1 pseudo-device sl 4 pseudo-device vnd 4 diff --git a/sys/arch/alpha/conf/JURA b/sys/arch/alpha/conf/JURA index fd66de8e82d..c7caa6c8c75 100644 --- a/sys/arch/alpha/conf/JURA +++ b/sys/arch/alpha/conf/JURA @@ -1,5 +1,5 @@ -# $OpenBSD: JURA,v 1.7 1996/10/30 22:38:40 niklas Exp $ -# $NetBSD: JURA,v 1.9 1996/09/27 17:08:34 cgd Exp $ +# $OpenBSD: JURA,v 1.8 1997/01/24 19:56:57 niklas Exp $ +# $NetBSD: JURA,v 1.11 1996/11/25 04:16:18 cgd Exp $ # # Kernel for jura.pdl.cs.cmu.edu. # @@ -19,7 +19,6 @@ options TIMEZONE="5*60" # Minutes west of GMT (for param.c) options DST=1 # Daylight savings rules (for param.c) # Standard system options -options SWAPPAGER, DEVPAGER # Paging (mandatory) options DEBUG, DIAGNOSTIC # Extra kernel debugging options KTRACE # System call tracing support @@ -54,8 +53,9 @@ jcombo* at ibus? # the VLSI combo chip isa* at jcombo? mcclock0 at isa? port 0x70 -pckbd0 at isa? port 0x60 irq 1 # PC-ish ISA keyboard -pms0 at isa? port 0x60 irq 12 # PS/2 auxiliary +pcppi* at isa? # PC prog. periph. interface +pckbd* at pcppi? # PC keyboard (kbd port) +pms* at pcppi? # PS/2-style mouse (aux port) com0 at isa? port 0x3f8 irq 4 # standard serial ports com1 at isa? port 0x2f8 irq 3 lpt0 at isa? port 0x3bc irq 7 # standard parallel port diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha index 5f3eb7aeb4f..e6ec43d6a2f 100644 --- a/sys/arch/alpha/conf/Makefile.alpha +++ b/sys/arch/alpha/conf/Makefile.alpha @@ -1,5 +1,5 @@ -# $OpenBSD: Makefile.alpha,v 1.9 1996/12/08 00:20:21 niklas Exp $ -# $NetBSD: Makefile.alpha,v 1.25 1996/09/27 17:33:04 cgd Exp $ +# $OpenBSD: Makefile.alpha,v 1.10 1997/01/24 19:56:58 niklas Exp $ +# $NetBSD: Makefile.alpha,v 1.27 1996/12/01 06:12:25 jonathan Exp $ # Makefile for OpenBSD # @@ -26,6 +26,7 @@ CC?= cc LD?= ld MKDEP?= mkdep STRIP?= strip +COPTS?= -O2 # source tree is located via $S relative to the compilation directory .ifndef S diff --git a/sys/arch/alpha/conf/NOSY b/sys/arch/alpha/conf/NOSY index 61eddd751eb..b2a48304b5b 100644 --- a/sys/arch/alpha/conf/NOSY +++ b/sys/arch/alpha/conf/NOSY @@ -1,5 +1,5 @@ -# $OpenBSD: NOSY,v 1.5 1996/10/30 22:38:42 niklas Exp $ -# $NetBSD: NOSY,v 1.9 1996/09/27 17:08:34 cgd Exp $ +# $OpenBSD: NOSY,v 1.6 1997/01/24 19:56:59 niklas Exp $ +# $NetBSD: NOSY,v 1.10 1996/11/15 19:37:31 cgd Exp $ # # Jason's DEC 3000/400 in the lab... # @@ -16,7 +16,6 @@ options TIMEZONE="8*60" # Minutes west of GMT (for param.c) options DST=1 # Daylight savings rules (for param.c) # Standard system options -options SWAPPAGER, DEVPAGER # Paging (mandatory) options DEBUG, DIAGNOSTIC # Extra kernel debugging options KTRACE # System call tracing support diff --git a/sys/arch/alpha/conf/OPAL b/sys/arch/alpha/conf/OPAL index 43440918adb..9f3ecbb73d0 100644 --- a/sys/arch/alpha/conf/OPAL +++ b/sys/arch/alpha/conf/OPAL @@ -1,4 +1,4 @@ -# $OpenBSD: OPAL,v 1.4 1996/10/30 22:38:43 niklas Exp $ +# $OpenBSD: OPAL,v 1.5 1997/01/24 19:57:00 niklas Exp $ # # OPAL, kernel for a DEC Multia at Applitron @@ -14,10 +14,10 @@ option TIMEZONE="-1*60" # Minutes west of GMT (for param.c) option DST=1 # Daylight savings rules (for param.c) # Standard system options -option SWAPPAGER, DEVPAGER # Paging (mandatory) option DEBUG, DIAGNOSTIC # Extra kernel debugging option KTRACE # System call tracing support #option DDB # Kernel debugger (not yet supported) +option BOOTKEY # Wait for key press before reboot/halt # File system options option FIFO # POSIX fifo support (in all file systems) @@ -102,7 +102,7 @@ de* at pci? le* at pci? ncr* at pci? pceb* at pci? -pcivga* at pci? +vga* at pci? ppb* at pci? sio* at pci? tga* at pci? @@ -116,8 +116,9 @@ isa* at sio? # ISA devices #isadma0 at isa? mcclock0 at isa? port 0x70 -pckbd0 at isa? port 0x60 irq 1 # PC-ish ISA keyboard -pms0 at isa? port 0x60 irq 12 # PS/2 auxiliary +pcppi* at isa? # PC prog. periph. interface +pckbd* at pcppi? # PC keyboard (kbd port) +pms* at pcppi? # PS/2-style mouse (aux port) com0 at isa? port 0x3f8 irq 4 # standard serial ports com1 at isa? port 0x2f8 irq 3 lpt0 at isa? port 0x3bc irq 7 # standard parallel port @@ -143,7 +144,7 @@ uk* at scsibus? target ? lun ? # Workstation Console attachments wscons* at cfb? -wscons* at pcivga? +wscons* at vga? wscons* at sfb? wscons* at tga? diff --git a/sys/arch/alpha/conf/RAMDISK b/sys/arch/alpha/conf/RAMDISK index 115116e2ad4..889529aee36 100644 --- a/sys/arch/alpha/conf/RAMDISK +++ b/sys/arch/alpha/conf/RAMDISK @@ -1,5 +1,5 @@ -# $OpenBSD: RAMDISK,v 1.1 1996/10/30 22:38:44 niklas Exp $ -# $NetBSD: RAMDISK,v 1.4 1996/10/03 20:47:19 cgd Exp $ +# $OpenBSD: RAMDISK,v 1.2 1997/01/24 19:57:02 niklas Exp $ +# $NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $ # # Generic Alpha kernel. Enough to get booted, etc., but not much more. @@ -13,6 +13,7 @@ options DEC_3000_300 # Pelican etc: 3000/300* options DEC_2100_A50 # Avanti etc: AlphaStation 400, 200, etc. options DEC_KN20AA # KN20AA: AlphaStation 600 options DEC_AXPPCI_33 # NoName: AXPpci33, etc. +options DEC_EB164 # EB164: AlphaPC 164 #options DEC_2000_300 # "Jensen": 2000/300 (DECpc AXP 150) # Enable the hooks used for initializing the ram-disk. @@ -24,7 +25,6 @@ options TIMEZONE="5*60" # Minutes west of GMT (for param.c) options DST=1 # Daylight savings rules (for param.c) # Standard system options -options SWAPPAGER, DEVPAGER # Paging (mandatory) options DEBUG, DIAGNOSTIC # Extra kernel debugging options KTRACE # System call tracing support @@ -76,8 +76,8 @@ tcasic* at mainbus0 tc* at tcasic? # TurboChannel devices -ioasic0 at tc? slot ? offset ? -mcclock0 at ioasic? offset ? +ioasic* at tc? slot ? offset ? +mcclock* at ioasic? offset ? le* at ioasic? offset ? scc0 at ioasic? offset ? scc1 at ioasic? offset ? @@ -109,7 +109,7 @@ fpa* at pci? dev ? function ? # DEC DEFPA FDDI cards le* at pci? dev ? function ? # PCI LANCE Ethernet (untested) ncr* at pci? dev ? function ? # NCR 53c8xx SCSI pceb* at pci? dev ? function ? # Intel PCI-EISA brige -pcivga* at pci? dev ? function ? # PCI VGA graphics +vga* at pci? dev ? function ? # PCI VGA graphics ppb* at pci? dev ? function ? # PCI-PCI bridges sio* at pci? dev ? function ? # Intel PCI-ISA bridge tga* at pci? dev ? function ? # DEC ZLXp-E[123] graphics @@ -120,13 +120,15 @@ eisa* at pceb? isa* at sio? # ISA devices -mcclock0 at isa? port 0x70 -pckbd0 at isa? port 0x60 irq 1 # PC-ish ISA keyboard -pms0 at isa? port 0x60 irq 12 # PS/2 auxiliary -com0 at isa? port 0x3f8 irq 4 # standard serial ports -com1 at isa? port 0x2f8 irq 3 -lpt0 at isa? port 0x3bc irq 7 # standard parallel port -#wss0 at isa? port 0x530 irq 9 drq 0 # Windows Sound System +mcclock* at isa? port 0x70 +pcppi* at isa? # PC prog. periph. interface +pckbd* at pcppi? # PC keyboard (kbd port) +pms* at pcppi? # 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 +#wss* at isa? port 0x530 irq 9 drq 0 # Windows Sound System # EISA devices fea* at eisa? slot ? # DEC DEFEA FDDI cards @@ -136,19 +138,19 @@ scsibus* at esp? scsibus* at ncr? # SCSI devices -sd* at scsibus? target ? lun ? -st* at scsibus? target ? lun ? -cd* at scsibus? target ? lun ? +cd* at scsibus? target ? lun ? # SCSI CD-ROM drives +sd* at scsibus? target ? lun ? # SCSI disk drives +st* at scsibus? target ? lun ? # SCSI tape drives # Workstation Console attachments wscons* at cfb? -wscons* at pcivga? +wscons* at vga? wscons* at sfb? wscons* at tga? pseudo-device bpfilter 16 pseudo-device loop pseudo-device pty 64 +pseudo-device rd 1 pseudo-device sl 4 pseudo-device vnd 4 -pseudo-device rd 1 diff --git a/sys/arch/alpha/conf/files.alpha b/sys/arch/alpha/conf/files.alpha index 4fa2d3f237c..404a5430d30 100644 --- a/sys/arch/alpha/conf/files.alpha +++ b/sys/arch/alpha/conf/files.alpha @@ -1,5 +1,5 @@ -# $OpenBSD: files.alpha,v 1.7 1996/12/08 00:20:22 niklas Exp $ -# $NetBSD: files.alpha,v 1.27 1996/10/22 21:15:45 cgd Exp $ +# $OpenBSD: files.alpha,v 1.8 1997/01/24 19:57:03 niklas Exp $ +# $NetBSD: files.alpha,v 1.32 1996/11/25 04:03:21 cgd Exp $ # # alpha-specific configuration info @@ -8,15 +8,26 @@ maxpartitions 8 maxusers 2 8 64 +# a wscons output device; used later, but needs to be near the top for +# common file (e.g. vga) definitions. +define wsconsdev {[console = -1]} + +# this loses, but there's no way to define attributes which have attributes +define alpha_shared_intr +file arch/alpha/common/shared_intr.c alpha_shared_intr | dec_eb164 | + dec_kn20aa + +device vga: wsconsdev +file arch/alpha/common/vga.c vga # # Bus-independent devices # -device mainbus { } # no locators (yet?) +device mainbus { } # no locators (yet?) attach mainbus at root -device cpu { } # not really optional; can be a 'bus' +device cpu { } # not really optional attach cpu at mainbus file arch/alpha/alpha/cpu.c cpu @@ -49,7 +60,6 @@ file arch/alpha/wscons/wscons_rops.c raster # # "Workstation Console" glue; attaches frame buffer to emulator & kbd. # -define wsconsdev {[console = -1]} device wscons attach wscons at wsconsdev file arch/alpha/wscons/wscons.c wscons needs-flag @@ -59,7 +69,6 @@ file arch/alpha/wscons/event.c wscons file arch/alpha/wscons/kbd.c wscons file arch/alpha/wscons/ms.c wscons - # # TurboChannel Devices # @@ -137,13 +146,22 @@ include "dev/isa/files.isa" #device jcombo at ibus: isabus #device jeisa at ibus: eisabus -device pckbd -attach pckbd at isa -file arch/alpha/isa/pckbd.c pckbd needs-flag -device pms -attach pms at isa -file arch/alpha/isa/pms.c pms needs-flag +file arch/alpha/isa/isa_machdep.c isa + +device pcppi { } +attach pcppi at isa +file arch/alpha/isa/pcppi.c pcppi +device pckbd +attach pckbd at pcppi +file arch/alpha/isa/pckbd.c pckbd + +device pms +attach pms at pcppi +file arch/alpha/isa/pms.c pms + +attach vga at isa with vga_isa +file arch/alpha/isa/vga_isa.c vga_isa needs-flag # # EISA Bus support @@ -161,16 +179,17 @@ include "dev/eisa/files.eisa" device apecs: pcibus attach apecs at mainbus file arch/alpha/pci/apecs.c apecs +file arch/alpha/pci/apecs_bus_io.c apecs +file arch/alpha/pci/apecs_bus_mem.c apecs file arch/alpha/pci/apecs_pci.c apecs device lca: pcibus attach lca at mainbus file arch/alpha/pci/lca.c lca +file arch/alpha/pci/lca_bus_io.c lca +file arch/alpha/pci/lca_bus_mem.c lca file arch/alpha/pci/lca_pci.c lca -file arch/alpha/pci/apecs_lca_bus_io.c apecs | lca -file arch/alpha/pci/apecs_lca_bus_mem.c apecs | lca - device cia: pcibus attach cia at mainbus file arch/alpha/pci/cia.c cia @@ -179,8 +198,10 @@ file arch/alpha/pci/cia_bus_mem.c cia file arch/alpha/pci/cia_pci.c cia file arch/alpha/pci/pci_2100_a50.c dec_2100_a50 -file arch/alpha/pci/pci_kn20aa.c dec_kn20aa file arch/alpha/pci/pci_axppci_33.c dec_axppci_33 +file arch/alpha/pci/pci_eb164.c dec_eb164 +file arch/alpha/pci/pci_eb164_intr.s dec_eb164 +file arch/alpha/pci/pci_kn20aa.c dec_kn20aa # @@ -189,7 +210,7 @@ file arch/alpha/pci/pci_axppci_33.c dec_axppci_33 file arch/alpha/pci/pci_machdep.c pci -device sio: isabus +device sio: isabus, alpha_shared_intr attach sio at pci device pceb: isabus, eisabus attach pceb at pci @@ -204,9 +225,8 @@ file arch/alpha/pci/tga_bt463.c tga file arch/alpha/pci/tga_bt485.c tga -device pcivga: wsconsdev -attach pcivga at pci -file arch/alpha/pci/pcivga.c pcivga needs-flag +attach vga at pci with vga_pci +file arch/alpha/pci/vga_pci.c vga_pci needs-flag # @@ -255,12 +275,14 @@ file netns/ns_cksum.c ns file arch/alpha/alpha/promcons.c # XXX -file arch/alpha/alpha/dec_3000_500.c dec_3000_500 -file arch/alpha/alpha/dec_3000_300.c dec_3000_300 -file arch/alpha/alpha/dec_2100_a50.c dec_2100_a50 -file arch/alpha/alpha/dec_kn20aa.c dec_kn20aa -file arch/alpha/alpha/dec_axppci_33.c dec_axppci_33 -file arch/alpha/alpha/dec_21000.c dec_21000 +file arch/alpha/alpha/cpuconf.c +file arch/alpha/alpha/dec_2100_a50.c dec_2100_a50 needs-flag +file arch/alpha/alpha/dec_21000.c dec_21000 needs-flag +file arch/alpha/alpha/dec_3000_300.c dec_3000_300 needs-flag +file arch/alpha/alpha/dec_3000_500.c dec_3000_500 needs-flag +file arch/alpha/alpha/dec_axppci_33.c dec_axppci_33 needs-flag +file arch/alpha/alpha/dec_eb164.c dec_eb164 needs-flag +file arch/alpha/alpha/dec_kn20aa.c dec_kn20aa needs-flag # OSF/1 Binary Compatibility (COMPAT_OSF1) include "compat/osf1/files.osf1" diff --git a/sys/arch/alpha/conf/std.alpha b/sys/arch/alpha/conf/std.alpha index b780edc31b9..6d043a81666 100644 --- a/sys/arch/alpha/conf/std.alpha +++ b/sys/arch/alpha/conf/std.alpha @@ -1,14 +1,20 @@ -# $OpenBSD: std.alpha,v 1.4 1996/12/08 00:20:23 niklas Exp $ -# $NetBSD: std.alpha,v 1.8 1996/09/27 17:18:02 cgd Exp $ +# $OpenBSD: std.alpha,v 1.5 1997/01/24 19:57:04 niklas Exp $ +# $NetBSD: std.alpha,v 1.11 1996/11/15 19:37:34 cgd Exp $ # # Standard/required configuration info for OpenBSD/alpha. machine alpha makeoptions DEBUG="-g" -# NetBSD has these, OpenBSD has them in CDIAGFLAGS in Makefile.alpha instead. -#makeoptions CWARNFLAGS="-Werror -Wcast-qual" -options EXEC_ECOFF -options EXEC_ELF64 -options EXEC_SCRIPT +# standard ("mandatory") kernel options. + +# Executable support: once transitioned to ELF, EXEC_ECOFF will become optional +options EXEC_ECOFF # (native) ECOFF binary support +options EXEC_ELF64 # (native) ELF64 binary support +options EXEC_SCRIPT # shell script support + +# VM pager support +options SWAPPAGER # paging; REQUIRED +options VNODEPAGER # mmap() of files; REQUIRED +options DEVPAGER # mmap() of devices; REQUIRED |