diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2026-01-08 14:54:15 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2026-01-08 14:54:15 +0000 |
| commit | 16f8ea6a81b59a82d8c27c6b3aa380617485bfd2 (patch) | |
| tree | 15f4f8e2c8b906440b94ebce6b276a6830d43312 | |
| parent | d2f1c8e0d1bebab9fba32d69d261abc101f368ba (diff) | |
| -rw-r--r-- | sys/amd64/conf/GENERIC | 3 | ||||
| -rw-r--r-- | 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 |