aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/tpm/Kconfig
diff options
context:
space:
mode:
authorRajiv Andrade <srajiv@linux.vnet.ibm.com>2010-05-04 18:49:20 -0300
committerJames Morris <jmorris@namei.org>2010-05-05 09:59:57 +1000
commitb89e66e1e396f7b5436af154e58209320cc08aed (patch)
treec966432f8e7bcc40f977546306b63beb0f8599fb /drivers/char/tpm/Kconfig
parentfcaaade1db63bb2d6f7611d7824eb50d2f07a546 (diff)
downloadkernel_goldelico_gta04-b89e66e1e396f7b5436af154e58209320cc08aed.zip
kernel_goldelico_gta04-b89e66e1e396f7b5436af154e58209320cc08aed.tar.gz
kernel_goldelico_gta04-b89e66e1e396f7b5436af154e58209320cc08aed.tar.bz2
TPM: ACPI/PNP dependency removal
This patch pushes the ACPI dependency into the device driver code itself. Now, even without ACPI/PNP enabled, the device can be registered using the TIS specified memory space. This will however result in the lack of access to the bios event log, being the only implication of such ACPI removal. Signed-off-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com> Acked-by: Mimi Zohar <zohar@linux.vnet.ibm.com> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'drivers/char/tpm/Kconfig')
-rw-r--r--drivers/char/tpm/Kconfig14
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig
index f5fc64f..bfc2c26 100644
--- a/drivers/char/tpm/Kconfig
+++ b/drivers/char/tpm/Kconfig
@@ -17,20 +17,28 @@ menuconfig TCG_TPM
obtained at: <http://sourceforge.net/projects/trousers>. To
compile this driver as a module, choose M here; the module
will be called tpm. If unsure, say N.
- Note: For more TPM drivers enable CONFIG_PNP, CONFIG_ACPI
- and CONFIG_PNPACPI.
+ Note: For more TPM drivers and BIOS LOG access enable
+ CONFIG_PNP, CONFIG_ACPI and CONFIG_PNPACPI.
if TCG_TPM
config TCG_TIS
tristate "TPM Interface Specification 1.2 Interface"
- depends on PNP
---help---
If you have a TPM security chip that is compliant with the
TCG TIS 1.2 TPM specification say Yes and it will be accessible
from within Linux. To compile this driver as a module, choose
M here; the module will be called tpm_tis.
+config TCG_BIOS_LOG
+ bool "TPM bios mesurement log"
+ depends on X86
+ select ACPI
+ ---help---
+ ACPI is required for access to bios measurements lists and therefore
+ to validate the PCR[0] value. So say Yes in case you want this
+ feature and, consequently, ACPI will be enabled.
+
config TCG_NSC
tristate "National Semiconductor TPM Interface"
---help---