[src/trunk]: src/sys/arch Install agp_* drivers where pchb(4) is installed ex...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch Install agp_* drivers where pchb(4) is installed ex...
From: uebayasi <uebayasi%NetBSD.org@localhost>
Date: Tue, 31 Jul 2018 18:52:25 +0000
details:   https://anonhg.NetBSD.org/src/rev/acb9bba1e9ad
branches:  trunk
changeset: 333099:acb9bba1e9ad
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Sat Oct 18 16:56:51 2014 +0000

description:
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"

diffstat:

 sys/arch/amd64/conf/ALL           |  5 +++--
 sys/arch/amd64/conf/GENERIC       |  5 +++--
 sys/arch/amd64/conf/XEN3_DOM0     |  3 ++-
 sys/arch/i386/conf/ALL            |  5 +++--
 sys/arch/i386/conf/GENERIC        |  5 +++--
 sys/arch/i386/conf/INSTALL_FLOPPY |  3 ++-
 sys/arch/i386/conf/XEN3_DOM0      |  3 ++-
 sys/arch/x86/pci/files.pci        |  5 ++++-
 8 files changed, 22 insertions(+), 12 deletions(-)

diffs (174 lines):

diff -r ea8d94025215 -r acb9bba1e9ad sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL   Sat Oct 18 15:07:02 2014 +0000
+++ b/sys/arch/amd64/conf/ALL   Sat Oct 18 16:56:51 2014 +0000
@@ -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 @@
 
 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 @@
 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
diff -r ea8d94025215 -r acb9bba1e9ad sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Sat Oct 18 15:07:02 2014 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Sat Oct 18 16:56:51 2014 +0000
@@ -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 @@
 
 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 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
diff -r ea8d94025215 -r acb9bba1e9ad sys/arch/amd64/conf/XEN3_DOM0
--- a/sys/arch/amd64/conf/XEN3_DOM0     Sat Oct 18 15:07:02 2014 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOM0     Sat Oct 18 16:56:51 2014 +0000
@@ -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 @@
                                        # 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
diff -r ea8d94025215 -r acb9bba1e9ad sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL    Sat Oct 18 15:07:02 2014 +0000
+++ b/sys/arch/i386/conf/ALL    Sat Oct 18 16:56:51 2014 +0000
@@ -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 @@
 
 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 @@
 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
diff -r ea8d94025215 -r acb9bba1e9ad sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Sat Oct 18 15:07:02 2014 +0000
+++ b/sys/arch/i386/conf/GENERIC        Sat Oct 18 16:56:51 2014 +0000
@@ -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 @@
 
 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 @@
 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
diff -r ea8d94025215 -r acb9bba1e9ad sys/arch/i386/conf/INSTALL_FLOPPY
--- a/sys/arch/i386/conf/INSTALL_FLOPPY Sat Oct 18 15:07:02 2014 +0000
+++ b/sys/arch/i386/conf/INSTALL_FLOPPY Sat Oct 18 16:56:51 2014 +0000
@@ -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 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
diff -r ea8d94025215 -r acb9bba1e9ad sys/arch/i386/conf/XEN3_DOM0
--- a/sys/arch/i386/conf/XEN3_DOM0      Sat Oct 18 15:07:02 2014 +0000
+++ b/sys/arch/i386/conf/XEN3_DOM0      Sat Oct 18 16:56:51 2014 +0000
@@ -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 @@
                                        # 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
diff -r ea8d94025215 -r acb9bba1e9ad sys/arch/x86/pci/files.pci
--- a/sys/arch/x86/pci/files.pci        Sat Oct 18 15:07:02 2014 +0000
+++ b/sys/arch/x86/pci/files.pci        Sat Oct 18 16:56:51 2014 +0000
@@ -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/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
Prev by Date: [src/trunk]: src/lib/libedit callers's -> caller's
Next by Date: [src/trunk]: src/sys/dev/ic Add more bits and comments, parts from jmcneill.
Previous by Thread: [src/trunk]: src/lib/libedit callers's -> caller's
Next by Thread: [src/trunk]: src/sys/dev/ic Add more bits and comments, parts from jmcneill.
Indexes:
Home | Main Index | Thread Index | Old Index