[src/trunk]: src/sys/arch Update to include the tco driver (it was previously...

[pgoyette <pgoyette%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c0ad74a72dbf
branches:  trunk
changeset: 808046:c0ad74a72dbf
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Sun May 03 02:52:50 2015 +0000

description:
Update to include the tco driver (it was previously included as part of
ichlpcib).

diffstat:

 sys/arch/amd64/conf/ALL     |  7 ++++---
 sys/arch/amd64/conf/GENERIC |  7 ++++---
 sys/arch/i386/conf/ALL      |  7 ++++---
 sys/arch/i386/conf/GENERIC  |  7 ++++---
 4 files changed, 16 insertions(+), 12 deletions(-)

diffs (120 lines):

diff -r 8374fc52be04 -r c0ad74a72dbf sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL   Sun May 03 02:50:59 2015 +0000
+++ b/sys/arch/amd64/conf/ALL   Sun May 03 02:52:50 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.28 2015/04/28 13:52:49 rjs Exp $
+# $NetBSD: ALL,v 1.29 2015/05/03 02:52:50 pgoyette 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.28 $"
+#ident                 "ALL-$Revision: 1.29 $"
 
 maxusers       64              # estimated number of users
 
@@ -449,9 +449,10 @@
 amdpcib* at pci? dev ? function ?      # AMD 8111 PCI-ISA w/ HPET
 hpet*  at amdpcib?
 ichlpcib* at pci? dev ? function ?     # Intel ICH PCI-ISA w/ timecounter,
-                                       # watchdog, SpeedStep and HPET
+                                       # watchdog, gpio, SpeedStep and HPET
 hpet0  at ichlpcib?                    # High Precision Event Timer
 fwhrng* at ichlpcib?                   # Intel 82802 FWH Random Number Generator
+tco*   at ichlpcib?                    # TCO watchdog timer
 rdcpcib* at pci? dev ? function ?      # RDC Vortex86/PMX-1000 PCI-ISA w/
 pchb*  at pci? dev ? function ?        # PCI-Host bridges
 options        AGP_X86
diff -r 8374fc52be04 -r c0ad74a72dbf sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Sun May 03 02:50:59 2015 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Sun May 03 02:52:50 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.412 2015/04/23 11:32:55 pgoyette Exp $
+# $NetBSD: GENERIC,v 1.413 2015/05/03 02:52:50 pgoyette Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.412 $"
+#ident                 "GENERIC-$Revision: 1.413 $"
 
 maxusers       64              # estimated number of users
 
@@ -354,9 +354,10 @@
 pwdog* at pci? dev ? function ?        # QUANCOM PWDOG1
 
 ichlpcib* at pci? dev ? function ?     # Intel ICH PCI-LPC w/ timecounter,
-                                       # watchdog and Speedstep and HPET
+                                       # watchdog, gpio, Speedstep and HPET
 fwhrng* at ichlpcib?           # Intel 82802 FWH Random Number Generator
 #hpet* at ichlpcib?
+tco*   at ichlpcib?            # TCO watch dog timer
 
 aapic* at pci? dev ? function ?        # AMD 8131 IO apic
 
diff -r 8374fc52be04 -r c0ad74a72dbf sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL    Sun May 03 02:50:59 2015 +0000
+++ b/sys/arch/i386/conf/ALL    Sun May 03 02:52:50 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.393 2015/04/29 11:37:31 riastradh Exp $
+# $NetBSD: ALL,v 1.394 2015/05/03 02:52:50 pgoyette 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.393 $"
+#ident                 "ALL-$Revision: 1.394 $"
 
 maxusers       64              # estimated number of users
 
@@ -486,9 +486,10 @@
 amdpcib* at pci? dev ? function ?      # AMD 8111 PCI-ISA w/ HPET
 hpet*  at amdpcib?
 ichlpcib* at pci? dev ? function ?     # Intel ICH PCI-ISA w/ timecounter,
-                                       # watchdog, SpeedStep and HPET
+                                       # watchdog, gpio, SpeedStep and HPET
 hpet0  at ichlpcib?                    # High Precision Event Timer
 fwhrng* at ichlpcib?                   # Intel 82802 FWH Random Number Generator
+tco*   at ichlpcib?                    # TCO watchdog timer
 gcscpcib* at pci? dev ? function ?     # AMD CS5535/CS5536 PCI-ISA w/
 gpio*  at gcscpcib?                    # timecounter, watchdog and GPIO
 piixpcib* at pci? dev ? function ?     # Intel PIIX4 PCI-ISA w/ SpeedStep
diff -r 8374fc52be04 -r c0ad74a72dbf sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Sun May 03 02:50:59 2015 +0000
+++ b/sys/arch/i386/conf/GENERIC        Sun May 03 02:52:50 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1122 2015/04/29 17:43:06 riastradh Exp $
+# $NetBSD: GENERIC,v 1.1123 2015/05/03 02:52:50 pgoyette Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.1122 $"
+#ident                 "GENERIC-$Revision: 1.1123 $"
 
 maxusers       64              # estimated number of users
 
@@ -451,9 +451,10 @@
 #amdpcib* at pci? dev ? function ?     # AMD 8111 PCI-ISA w/ HPET
 #hpet* at amdpcib?
 ichlpcib* at pci? dev ? function ?     # Intel ICH PCI-LPC w/ timecounter,
-                                       # watchdog, SpeedStep and HPET
+                                       # watchdog, gpio, SpeedStep and HPET
 fwhrng* at ichlpcib?           # Intel 82802 FWH Random Number Generator
 #hpet* at ichlpcib?
+tco*   at ichlpbib?            # TCO watchdog timer
 tcpcib* at pci? dev ? function ?       # Intel Atom E6xx PCI-LPC
 hpet* at tcpcib?
 gcscpcib* at pci? dev ? function ?     # AMD CS5535/CS5536 PCI-ISA w/