Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch No I/O ports for TPM-ISA, only MMIO, so remove comm...
details: https://anonhg.NetBSD.org/src/rev/484baf6cc392
branches: trunk
changeset: 965973:484baf6cc392
user: maxv <maxv%NetBSD.org@localhost>
date: Tue Oct 08 18:50:44 2019 +0000
description:
No I/O ports for TPM-ISA, only MMIO, so remove commented-out options.
diffstat:
sys/arch/amd64/conf/ALL | 9 ++-------
sys/arch/amd64/conf/GENERIC | 8 ++------
sys/arch/i386/conf/ALL | 9 ++-------
sys/arch/i386/conf/GENERIC | 8 ++------
4 files changed, 8 insertions(+), 26 deletions(-)
diffs (122 lines):
diff -r baddc30247c3 -r 484baf6cc392 sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL Tue Oct 08 18:50:34 2019 +0000
+++ b/sys/arch/amd64/conf/ALL Tue Oct 08 18:50:44 2019 +0000
@@ -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 @@
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 @@
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
diff -r baddc30247c3 -r 484baf6cc392 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC Tue Oct 08 18:50:34 2019 +0000
+++ b/sys/arch/amd64/conf/GENERIC Tue Oct 08 18:50:44 2019 +0000
@@ -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 @@
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 @@
# 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
diff -r baddc30247c3 -r 484baf6cc392 sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL Tue Oct 08 18:50:34 2019 +0000
+++ b/sys/arch/i386/conf/ALL Tue Oct 08 18:50:44 2019 +0000
@@ -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 @@
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 @@
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
diff -r baddc30247c3 -r 484baf6cc392 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC Tue Oct 08 18:50:34 2019 +0000
+++ b/sys/arch/i386/conf/GENERIC Tue Oct 08 18:50:44 2019 +0000
@@ -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 @@
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 @@
# 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
Home |
Main Index |
Thread Index |
Old Index