diff options
| -rw-r--r-- | sys/amd64/conf/GENERIC | 2 | ||||
| -rw-r--r-- | sys/amd64/conf/MINIMAL | 2 | ||||
| -rw-r--r-- | sys/powerpc/conf/MPC85XX | 2 | ||||
| -rw-r--r-- | sys/powerpc/conf/QORIQ64 | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 0548c90985d1..e06c585318b6 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -327,7 +327,7 @@ device bpf # Berkeley packet filter # random(4) device rdrand_rng # Intel Bull Mountain RNG device tpm # Trusted Platform Module -options RANDOM_ENABLE_TPM # enable entropy from TPM 2.0 +options RANDOM_ENABLE_TPM # enable entropy from TPM devices # USB support options USB_DEBUG # enable debug msgs diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL index b7baa2bd061d..043ef348698b 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -138,7 +138,7 @@ device bpf # Berkeley packet filter # random(4) device rdrand_rng # Intel Bull Mountain RNG device tpm # Trusted Platform Module -options RANDOM_ENABLE_TPM # enable entropy from TPM 2.0 +options RANDOM_ENABLE_TPM # enable entropy from TPM devices # VirtIO support device virtio # Generic VirtIO bus (required) diff --git a/sys/powerpc/conf/MPC85XX b/sys/powerpc/conf/MPC85XX index c74819c7fee0..8ca927f9d896 100644 --- a/sys/powerpc/conf/MPC85XX +++ b/sys/powerpc/conf/MPC85XX @@ -29,6 +29,7 @@ options DDB options DEVICE_POLLING #options DIAGNOSTIC options FDT +options RANDOM_ENABLE_TPM #makeoptions FDT_DTS_FILE=mpc8555cds.dts options FFS options GDB @@ -103,6 +104,7 @@ device sdhci device sec device spibus device spigen +device tpm device tsec device dpaa device tuntap diff --git a/sys/powerpc/conf/QORIQ64 b/sys/powerpc/conf/QORIQ64 index c64d015c37d1..37c087dd8a4d 100644 --- a/sys/powerpc/conf/QORIQ64 +++ b/sys/powerpc/conf/QORIQ64 @@ -32,6 +32,7 @@ options DDB options DEVICE_POLLING #options DIAGNOSTIC options FDT +options RANDOM_ENABLE_TPM #makeoptions FDT_DTS_FILE=mpc8555cds.dts options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support @@ -106,6 +107,7 @@ device scc device sdhci device spibus device spigen +device tpm device tuntap device uart options USB_DEBUG # enable debug msgs |