diff options
| author | nork <nork@FreeBSD.org> | 2010-09-19 14:40:37 +0000 |
|---|---|---|
| committer | nork <nork@FreeBSD.org> | 2010-09-19 14:40:37 +0000 |
| commit | 9673f78b29dbcfcf67a2a68cb4ca94519e57a417 (patch) | |
| tree | c88b9ca1133a3afd920d4676dd3de3c8af13ad6c | |
| parent | 99ba5ac1139f70822852c05d5c11054245b95da3 (diff) | |
| download | FreeBSD-src-9673f78b29dbcfcf67a2a68cb4ca94519e57a417.zip FreeBSD-src-9673f78b29dbcfcf67a2a68cb4ca94519e57a417.tar.gz | |
Add support 'device tpm' for amd64.
Add tpm(4)'s default setting to /boot/defaults/loader.conf.
Add 'device tpm' to NOTES for amd64 and i386.
Discussed with: takawata
Approved by: imp (mentor)
| -rw-r--r-- | sys/amd64/conf/NOTES | 2 | ||||
| -rw-r--r-- | sys/boot/forth/loader.conf | 1 | ||||
| -rw-r--r-- | sys/conf/files.amd64 | 3 | ||||
| -rw-r--r-- | sys/i386/conf/NOTES | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index 67fbcd7..e69e4ad 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -421,6 +421,7 @@ options SAFE_RNDTEST # enable rndtest support # vpd: Vital Product Data kernel interface # asmc: Apple System Management Controller # si: Specialix International SI/XIO or SX intelligent serial card +# tpm: Trusted Platform Module # Notes on the Specialix SI/XIO driver: # The host card is memory, not IO mapped. @@ -436,6 +437,7 @@ device smbios device vpd device asmc #device si +device tpm # # Laptop/Notebook options: diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf index eac8fe6..4f07b91 100644 --- a/sys/boot/forth/loader.conf +++ b/sys/boot/forth/loader.conf @@ -473,6 +473,7 @@ vkbd_load="NO" # Virtual AT keyboard interface vpd_load="NO" # Vital Product Data kernel interface vpo_load="NO" # Parallel to SCSI interface driver amdtemp_load="NO" # AMD K8/K10/K11 temperature monitor +tpm_load="NO" # Trusted Platform Module ############################################################## ### ACPI settings ########################################## diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 727a102..ec7ffb5 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -229,6 +229,9 @@ dev/syscons/scterm-teken.c optional sc dev/syscons/scvesactl.c optional sc vga vesa dev/syscons/scvgarndr.c optional sc vga dev/syscons/scvtb.c optional sc +dev/tpm/tpm.c optional tpm +dev/tpm/tpm_acpi.c optional tpm acpi +dev/tpm/tpm_isa.c optional tpm isa dev/uart/uart_cpu_amd64.c optional uart dev/wpi/if_wpi.c optional wpi isa/syscons_isa.c optional sc diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index b4f8ee8..a68037b 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -751,6 +751,7 @@ device glxsb # AMD Geode LX Security Block # spic: Sony Programmable I/O controller (VAIO notebooks) # asmc: Apple System Management Controller # si: Specialix International SI/XIO or SX intelligent serial card driver +# tpm: Trusted Platform Module # Notes on APM # The flags takes the following meaning for apm0: @@ -789,6 +790,7 @@ hint.spic.0.at="isa" hint.spic.0.port="0x10a0" device asmc #device si +device tpm # # Laptop/Notebook options: |
