git: 16f8ea6a81b5 - main - amd64: Remove tpm(4) from GENERIC for now

The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=16f8ea6a81b59a82d8c27c6b3aa380617485bfd2

commit 16f8ea6a81b59a82d8c27c6b3aa380617485bfd2
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2026-01-08 14:54:15 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2026-01-08 14:54:15 +0000

    amd64: Remove tpm(4) from GENERIC for now
    
    It breaks suspend/resume and no one has had time to investigate and fix
    it.
    
    PR:             291067
    Reviewed by:    emaste
    Fixes:          3deb21f1afd5 ("random: TPM_HARVEST should have been named RANDOM_ENABLE_TPM")
    Differential Revision:  https://reviews.freebsd.org/D54587
---
 sys/amd64/conf/GENERIC | 3 ++-
 sys/amd64/conf/MINIMAL | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index ef7ce215474e..38b6dccb3579 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -324,7 +324,8 @@ device		bpf			# Berkeley packet filter
 
 # random(4)
 device		rdrand_rng		# Intel Bull Mountain RNG
-device		tpm			# Trusted Platform Module
+# Disabled for now since tpm(4) breaks suspend/resume.
+#device		tpm			# Trusted Platform Module
 options 	RANDOM_ENABLE_TPM	# enable entropy from TPM 2.0
 options 	RANDOM_ENABLE_KBD
 options 	RANDOM_ENABLE_MOUSE
diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL
index 8df3349b4c34..9f80fe2f42d5 100644
--- a/sys/amd64/conf/MINIMAL
+++ b/sys/amd64/conf/MINIMAL
@@ -122,7 +122,8 @@ device		bpf			# Berkeley packet filter
 
 # random(4)
 device		rdrand_rng		# Intel Bull Mountain RNG
-device		tpm			# Trusted Platform Module
+# Disabled for now since tpm(4) breaks suspend/resume.
+#device		tpm			# Trusted Platform Module
 options 	RANDOM_ENABLE_TPM	# enable entropy from TPM 2.0
 options 	RANDOM_ENABLE_KBD
 options 	RANDOM_ENABLE_MOUSE