Module Name: src
Committed By: christos
Date: Fri Feb 3 23:37:20 UTC 2012
Modified Files:
src/sys/arch/i386/conf: ALL
Log Message:
add tpm
To generate a diff of this commit:
cvs rdiff -u -r1.331 -r1.332 src/sys/arch/i386/conf/ALL
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/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.331 src/sys/arch/i386/conf/ALL:1.332
--- src/sys/arch/i386/conf/ALL:1.331 Sun Jan 29 13:55:12 2012
+++ src/sys/arch/i386/conf/ALL Fri Feb 3 18:37:20 2012
@@ -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 @@ include "arch/i386/conf/std.i386"
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 @@ npx* at acpi? # Math coprocessor
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 @@ hifn* at pci? dev ? function ? # Hifn 77
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
