Module Name: src
Committed By: uebayasi
Date: Sat Oct 18 16:56:51 UTC 2014
Modified Files:
src/sys/arch/amd64/conf: ALL GENERIC XEN3_DOM0
src/sys/arch/i386/conf: ALL GENERIC INSTALL_FLOPPY XEN3_DOM0
src/sys/arch/x86/pci: files.pci
Log Message:
Install agp_* drivers where pchb(4) is installed except INSTALL_FLOPPY.
XXX
Config around agp(4) is done in quite wrong direction.
"pchb <- (agpbus) <- agp <- agp_*"
should be:
"pchb <- (pcibus) <- agp_* <- (agpbus) <- agp"
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.399 -r1.400 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.109 -r1.110 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.386 -r1.387 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1114 -r1.1115 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/i386/conf/INSTALL_FLOPPY
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/x86/pci/files.pci
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.20 src/sys/arch/amd64/conf/ALL:1.21
--- src/sys/arch/amd64/conf/ALL:1.20 Fri Sep 19 17:30:03 2014
+++ src/sys/arch/amd64/conf/ALL Sat Oct 18 16:56:51 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.20 2014/09/19 17:30:03 christos Exp $
+# $NetBSD: ALL,v 1.21 2014/10/18 16:56:51 uebayasi Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.20 $"
+#ident "ALL-$Revision: 1.21 $"
maxusers 64 # estimated number of users
@@ -454,6 +454,7 @@ hpet0 at ichlpcib? # High Precision Ev
fwhrng* at ichlpcib? # Intel 82802 FWH Random Number Generator
rdcpcib* at pci? dev ? function ? # RDC Vortex86/PMX-1000 PCI-ISA w/
pchb* at pci? dev ? function ? # PCI-Host bridges
+options AGP_X86
pcib* at pci? dev ? function ? # PCI-ISA bridges
ppb* at pci? dev ? function ? # PCI-PCI bridges
# XXX 'puc's aren't really bridges, but there's no better place for them here
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.399 src/sys/arch/amd64/conf/GENERIC:1.400
--- src/sys/arch/amd64/conf/GENERIC:1.399 Fri Sep 19 17:30:03 2014
+++ src/sys/arch/amd64/conf/GENERIC Sat Oct 18 16:56:51 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.399 2014/09/19 17:30:03 christos Exp $
+# $NetBSD: GENERIC,v 1.400 2014/10/18 16:56:51 uebayasi Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.399 $"
+#ident "GENERIC-$Revision: 1.400 $"
maxusers 64 # estimated number of users
@@ -331,6 +331,7 @@ pci* at ppb? bus ?
# PCI bridges
pchb* at pci? dev ? function ? # PCI-Host bridges
+options AGP_X86
pcib* at pci? dev ? function ? # PCI-ISA bridges
ppb* at pci? dev ? function ? # PCI-PCI bridges
# XXX 'puc's aren't really bridges, but there's no better place for them here
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.109 src/sys/arch/amd64/conf/XEN3_DOM0:1.110
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.109 Sat Oct 11 09:50:03 2014
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Sat Oct 18 16:56:51 2014
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.109 2014/10/11 09:50:03 uebayasi Exp $
+# $NetBSD: XEN3_DOM0,v 1.110 2014/10/18 16:56:51 uebayasi Exp $
include "arch/amd64/conf/std.xen"
@@ -255,6 +255,7 @@ ichlpcib* at pci? dev ? function ? # Int
# watchdog and SpeedStep support
pcib* at pci? dev ? function ? # PCI-ISA bridges
pchb* at pci? dev ? function ? # PCI-Host bridges
+options AGP_X86
ppb* at pci? dev ? function ? # PCI-PCI bridges
# XXX 'puc's aren't really bridges, but there's no better place for them here
puc* at pci? dev ? function ? # PCI "universal" comm. cards
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.386 src/sys/arch/i386/conf/ALL:1.387
--- src/sys/arch/i386/conf/ALL:1.386 Fri Sep 19 17:30:03 2014
+++ src/sys/arch/i386/conf/ALL Sat Oct 18 16:56:51 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.386 2014/09/19 17:30:03 christos Exp $
+# $NetBSD: ALL,v 1.387 2014/10/18 16:56:51 uebayasi Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.386 $"
+#ident "ALL-$Revision: 1.387 $"
maxusers 64 # estimated number of users
@@ -497,6 +497,7 @@ viapcib* at pci? dev ? function ? # VIA
iic* at viapcib?
rdcpcib* at pci? dev ? function ? # RDC Vortex86/PMX-1000 PCI-ISA w/
pchb* at pci? dev ? function ? # PCI-Host bridges
+options AGP_X86
pceb* at pci? dev ? function ? # PCI-EISA bridges
pcib* at pci? dev ? function ? # PCI-ISA bridges
pcmb* at pci? dev ? function ? # PCI-MCA bridges
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1114 src/sys/arch/i386/conf/GENERIC:1.1115
--- src/sys/arch/i386/conf/GENERIC:1.1114 Fri Sep 19 17:30:03 2014
+++ src/sys/arch/i386/conf/GENERIC Sat Oct 18 16:56:51 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1114 2014/09/19 17:30:03 christos Exp $
+# $NetBSD: GENERIC,v 1.1115 2014/10/18 16:56:51 uebayasi Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1114 $"
+#ident "GENERIC-$Revision: 1.1115 $"
maxusers 64 # estimated number of users
@@ -464,6 +464,7 @@ iic* at viapcib?
rdcpcib* at pci? dev ? function ? # RDC Vortex86/PMX-1000 PCI-ISA w/
# watchdog
pchb* at pci? dev ? function ? # PCI-Host bridges
+options AGP_X86
pceb* at pci? dev ? function ? # PCI-EISA bridges
pcib* at pci? dev ? function ? # PCI-ISA bridges
pcmb* at pci? dev ? function ? # PCI-MCA bridges
Index: src/sys/arch/i386/conf/INSTALL_FLOPPY
diff -u src/sys/arch/i386/conf/INSTALL_FLOPPY:1.26 src/sys/arch/i386/conf/INSTALL_FLOPPY:1.27
--- src/sys/arch/i386/conf/INSTALL_FLOPPY:1.26 Sat Aug 23 21:10:20 2014
+++ src/sys/arch/i386/conf/INSTALL_FLOPPY Sat Oct 18 16:56:51 2014
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_FLOPPY,v 1.26 2014/08/23 21:10:20 dholland Exp $
+# $NetBSD: INSTALL_FLOPPY,v 1.27 2014/10/18 16:56:51 uebayasi Exp $
#
# INSTALL - Installation kernel.
#
@@ -209,6 +209,7 @@ pci* at ppb? bus ?
# PCI bridges
pchb* at pci? dev ? function ? # PCI-Host bridges
+#options AGP_X86
pceb* at pci? dev ? function ? # PCI-EISA bridges
pcib* at pci? dev ? function ? # PCI-ISA bridges
ppb* at pci? dev ? function ? # PCI-PCI bridges
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.90 src/sys/arch/i386/conf/XEN3_DOM0:1.91
--- src/sys/arch/i386/conf/XEN3_DOM0:1.90 Fri Sep 19 17:30:03 2014
+++ src/sys/arch/i386/conf/XEN3_DOM0 Sat Oct 18 16:56:51 2014
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.90 2014/09/19 17:30:03 christos Exp $
+# $NetBSD: XEN3_DOM0,v 1.91 2014/10/18 16:56:51 uebayasi Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -232,6 +232,7 @@ ichlpcib* at pci? dev ? function ? # Int
# watchdog and SpeedStep support
pcib* at pci? dev ? function ? # PCI-ISA bridges
pchb* at pci? dev ? function ? # PCI-Host bridges
+options AGP_X86
ppb* at pci? dev ? function ? # PCI-PCI bridges
# XXX 'puc's aren't really bridges, but there's no better place for them here
puc* at pci? dev ? function ? # PCI "universal" comm. cards
Index: src/sys/arch/x86/pci/files.pci
diff -u src/sys/arch/x86/pci/files.pci:1.17 src/sys/arch/x86/pci/files.pci:1.18
--- src/sys/arch/x86/pci/files.pci:1.17 Fri Oct 17 20:55:21 2014
+++ src/sys/arch/x86/pci/files.pci Sat Oct 18 16:56:51 2014
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.17 2014/10/17 20:55:21 uebayasi Exp $
+# $NetBSD: files.pci,v 1.18 2014/10/18 16:56:51 uebayasi Exp $
device aapic
attach aapic at pci
@@ -6,6 +6,9 @@ file arch/x86/pci/aapic.c aapic
file arch/x86/pci/agp_machdep.c agp
+define agp_x86: agp_ali, agp_amd, agp_amd64, agp_i810, agp_intel, agp_sis, agp_via
+defflag AGP_X86
+
define amdnb_miscbus {}
# PCI-Host bridge chipsets
