[src/trunk]: src/sys/arch/i386/conf add tpm

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

details:   https://anonhg.NetBSD.org/src/rev/da79bf438a52
branches:  trunk
changeset: 773497:da79bf438a52
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Feb 03 23:37:20 2012 +0000

description:
add tpm

diffstat:

 sys/arch/i386/conf/ALL |  12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diffs (40 lines):

diff -r 0d2f578767e6 -r da79bf438a52 sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL    Fri Feb 03 22:18:04 2012 +0000
+++ b/sys/arch/i386/conf/ALL    Fri Feb 03 23:37:20 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.331 2012/01/29 18:55:12 jakllsch Exp $
+# $NetBSD: ALL,v 1.332 2012/02/03 23:37:20 christos 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.331 $"
+#ident                 "ALL-$Revision: 1.332 $"
 
 maxusers       64              # estimated number of users
 
@@ -388,6 +388,7 @@
 pckbc*         at acpi?                # PC keyboard controller
 pcppi*         at acpi?                # AT-style speaker sound
 thinkpad*      at acpi?                # IBM/Lenovo Thinkpad hotkeys
+#tpm*          at acpi?                # ACPI TPM (Experimental)
 ug*            at acpi?                # Abit uGuru Hardware monitor
 wb*            at acpi?                # Winbond W83L518D SD/MMC reader
 sdmmc*         at wb?                  # SD/MMC bus
@@ -1564,6 +1565,13 @@
 ubsec* at pci? dev ? function ?        # Broadcom 5501/5601/580x/582x
 
 
+# Trusted Platform Module
+tpm*   at isa? iomem 0xfed40000 irq 7
+#tpm*  at isa? port 0x02e
+#tpm*  at isa? port 0x04e 
+#tpm*  at isa? port 0x07e 
+#tpm*  at isa? port 0x0ee
+
 # Joysticks
 
 joy*   at pnpbios? index ?             # Game port