From e6a9d460852b1cbeade4b031bf4fbf0566be40e9 Mon Sep 17 00:00:00 2001 From: cgd Date: Tue, 19 Nov 1996 04:43:55 +0000 Subject: [PATCH] update for VGA changes, and clean up slightly. --- sys/arch/alpha/conf/ALPHA | 10 ++++++---- sys/arch/alpha/conf/BUNNY | 6 +++--- sys/arch/alpha/conf/GENERIC | 10 ++++++---- sys/arch/alpha/conf/GENERIC.PROF | 9 ++++++--- sys/arch/alpha/conf/RAMDISK | 11 +++++++---- 5 files changed, 28 insertions(+), 18 deletions(-) diff --git a/sys/arch/alpha/conf/ALPHA b/sys/arch/alpha/conf/ALPHA index 80bafe188f3f..c6db73106f86 100644 --- a/sys/arch/alpha/conf/ALPHA +++ b/sys/arch/alpha/conf/ALPHA @@ -1,4 +1,4 @@ -# $NetBSD: ALPHA,v 1.26 1996/11/15 19:37:21 cgd Exp $ +# $NetBSD: ALPHA,v 1.27 1996/11/19 04:43:55 cgd Exp $ # # Alpha kernel with all the options you'd want, and more. @@ -134,7 +134,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 @@ -151,6 +151,8 @@ 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 +# VGA ON ISA CANNOT BE USED IN THE PRESENCE OF PCI VGA CARDS + VGA ON PCI. +#vga0 at isa? # ISA (EISA: XXX) VGA #wss0 at isa? port 0x530 irq 9 drq 0 # Windows Sound System # EISA devices @@ -167,7 +169,7 @@ cd* at scsibus? target ? lun ? # Workstation Console attachments wscons* at cfb? -wscons* at pcivga? +wscons* at vga? wscons* at sfb? wscons* at tga? @@ -175,8 +177,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 144fb357a144..9951f302bd3f 100644 --- a/sys/arch/alpha/conf/BUNNY +++ b/sys/arch/alpha/conf/BUNNY @@ -1,4 +1,4 @@ -# $NetBSD: BUNNY,v 1.10 1996/11/15 19:37:24 cgd Exp $ +# $NetBSD: BUNNY,v 1.11 1996/11/19 04:43:56 cgd Exp $ # # Kernel for bunnahabhain.pdl.cs.cmu.edu. # @@ -66,7 +66,7 @@ pci* at apecs? # PCI devices de* at pci? ncr* at pci? -pcivga* at pci? +vga* at pci? sio* at pci? tga* at pci? @@ -91,7 +91,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 4b4cb4277b75..08584b3e3c9b 100644 --- a/sys/arch/alpha/conf/GENERIC +++ b/sys/arch/alpha/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.27 1996/11/15 19:37:25 cgd Exp $ +# $NetBSD: GENERIC,v 1.28 1996/11/19 04:43:57 cgd Exp $ # # Generic Alpha kernel. Enough to get booted, etc., but not much more. @@ -104,7 +104,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 @@ -121,6 +121,8 @@ 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 +# VGA ON ISA CANNOT BE USED IN THE PRESENCE OF PCI VGA CARDS + VGA ON PCI. +#vga0 at isa? # ISA (EISA: XXX) VGA #wss0 at isa? port 0x530 irq 9 drq 0 # Windows Sound System # EISA devices @@ -137,13 +139,13 @@ cd* 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 514d599efac4..5c074b5cdd9c 100644 --- a/sys/arch/alpha/conf/GENERIC.PROF +++ b/sys/arch/alpha/conf/GENERIC.PROF @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC.PROF,v 1.6 1996/11/15 19:37:27 cgd Exp $ +# $NetBSD: GENERIC.PROF,v 1.7 1996/11/19 04:43:57 cgd Exp $ # # Generic Alpha kernel. Enough to get booted, etc., but not much more. @@ -108,7 +108,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 @@ -125,6 +125,8 @@ 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 +# VGA ON ISA CANNOT BE USED IN THE PRESENCE OF PCI VGA CARDS + VGA ON PCI. +#vga0 at isa? # ISA (EISA: XXX) VGA #wss0 at isa? port 0x530 irq 9 drq 0 # Windows Sound System # EISA devices @@ -141,12 +143,13 @@ cd* 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/RAMDISK b/sys/arch/alpha/conf/RAMDISK index 45ce5eb05642..a832c38ba359 100644 --- a/sys/arch/alpha/conf/RAMDISK +++ b/sys/arch/alpha/conf/RAMDISK @@ -1,4 +1,4 @@ -# $NetBSD: RAMDISK,v 1.5 1996/11/15 19:37:33 cgd Exp $ +# $NetBSD: RAMDISK,v 1.6 1996/11/19 04:43:58 cgd Exp $ # # Generic Alpha kernel. Enough to get booted, etc., but not much more. @@ -12,6 +12,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 #options DEC_2000_300 # "Jensen": 2000/300 (DECpc AXP 150) # Enable the hooks used for initializing the ram-disk. @@ -107,7 +108,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 @@ -124,6 +125,8 @@ 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 +# VGA ON ISA CANNOT BE USED IN THE PRESENCE OF PCI VGA CARDS + VGA ON PCI. +#vga0 at isa? # ISA (EISA: XXX) VGA #wss0 at isa? port 0x530 irq 9 drq 0 # Windows Sound System # EISA devices @@ -140,13 +143,13 @@ cd* 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