Module Name: src
Committed By: maxv
Date: Tue Oct 8 18:50:44 UTC 2019
Modified Files:
src/sys/arch/amd64/conf: ALL GENERIC
src/sys/arch/i386/conf: ALL GENERIC
Log Message:
No I/O ports for TPM-ISA, only MMIO, so remove commented-out options.
To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.537 -r1.538 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.471 -r1.472 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1211 -r1.1212 src/sys/arch/i386/conf/GENERIC
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.124 src/sys/arch/amd64/conf/ALL:1.125
--- src/sys/arch/amd64/conf/ALL:1.124 Mon Oct 7 11:53:40 2019
+++ src/sys/arch/amd64/conf/ALL Tue Oct 8 18:50:44 2019
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.124 2019/10/07 11:53:40 msaitoh Exp $
+# $NetBSD: ALL,v 1.125 2019/10/08 18:50:44 maxv 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.124 $"
+#ident "ALL-$Revision: 1.125 $"
maxusers 64 # estimated number of users
@@ -1549,13 +1549,8 @@ btsco* at bthub?
hifn* at pci? dev ? function ? # Hifn 7755/7811/795x
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
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.537 src/sys/arch/amd64/conf/GENERIC:1.538
--- src/sys/arch/amd64/conf/GENERIC:1.537 Mon Oct 7 11:53:40 2019
+++ src/sys/arch/amd64/conf/GENERIC Tue Oct 8 18:50:44 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.537 2019/10/07 11:53:40 msaitoh Exp $
+# $NetBSD: GENERIC,v 1.538 2019/10/08 18:50:44 maxv 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.537 $"
+#ident "GENERIC-$Revision: 1.538 $"
maxusers 64 # estimated number of users
@@ -437,10 +437,6 @@ ubsec* at pci? dev ? function ? # Broadc
# 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
# Serial Devices
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.471 src/sys/arch/i386/conf/ALL:1.472
--- src/sys/arch/i386/conf/ALL:1.471 Mon Oct 7 11:53:40 2019
+++ src/sys/arch/i386/conf/ALL Tue Oct 8 18:50:44 2019
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.471 2019/10/07 11:53:40 msaitoh Exp $
+# $NetBSD: ALL,v 1.472 2019/10/08 18:50:44 maxv 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.471 $"
+#ident "ALL-$Revision: 1.472 $"
maxusers 64 # estimated number of users
@@ -1667,13 +1667,8 @@ glxsb* at pci? dev ? function ? # AMD Ge
hifn* at pci? dev ? function ? # Hifn 7755/7811/795x
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
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1211 src/sys/arch/i386/conf/GENERIC:1.1212
--- src/sys/arch/i386/conf/GENERIC:1.1211 Mon Oct 7 11:53:40 2019
+++ src/sys/arch/i386/conf/GENERIC Tue Oct 8 18:50:44 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1211 2019/10/07 11:53:40 msaitoh Exp $
+# $NetBSD: GENERIC,v 1.1212 2019/10/08 18:50:44 maxv 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.1211 $"
+#ident "GENERIC-$Revision: 1.1212 $"
maxusers 64 # estimated number of users
@@ -1367,10 +1367,6 @@ ubsec* at pci? dev ? function ? # Broadc
# 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
