diff options
| author | Martin Roth <martinroth@google.com> | 2016-03-03 16:20:53 -0700 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2016-03-05 22:51:03 +0100 |
| commit | f7fd63066fe3b74a1ae10fa6eabf2605d5730449 (patch) | |
| tree | 98206c8f312bc549bfcdab4a02be7521b329d671 /src | |
| parent | 73f7069fe6915cce545d4a5839ab1760e1fed2a2 (diff) | |
tpm/acpi/tpm.asl: Only include tpm.asl if tpm is enabled
If the TPM code isn't getting built in, the Kconfig symbol
CONFIG_TPM_TIS_BASE_ADDRESS doesn't exist. This ends up creating
an invalid operating region in the ACPI tables, causing a bluescreen
in windows.
This should fix this issue:
https://ticket.coreboot.org/issues/35
"commit 85a255fb (acpi/tpm: Gracefully handle missing TPM module)
breaks Windows"
Change-Id: I32e0e09c1f61551a40f4842168f556d5e1940d28
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/13890
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/drivers/pc80/tpm/acpi/tpm.asl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/drivers/pc80/tpm/acpi/tpm.asl b/src/drivers/pc80/tpm/acpi/tpm.asl index de2511467a..090bf4c820 100644 --- a/src/drivers/pc80/tpm/acpi/tpm.asl +++ b/src/drivers/pc80/tpm/acpi/tpm.asl @@ -15,6 +15,8 @@ /* Trusted Platform Module */ +#if CONFIG_LPC_TPM + Device (TPM) { Name (_HID, EISAID ("PNP0C31")) @@ -41,7 +43,7 @@ Device (TPM) Method (_STA, 0) { -#if CONFIG_LPC_TPM && !CONFIG_TPM_DEACTIVATE +#if !CONFIG_TPM_DEACTIVATE If (LAnd (LGreater (DVID, 0), LLess (DVID, 0xffffffff))) { Return (0xf) } Else { @@ -213,3 +215,5 @@ Device (TPM) Return (Buffer (1) { 0 }) } } + +#endif /* CONFIG_LPC_TPM */ |