GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Martin Roth 2016-03-03 16:20:53 -07:00
parent 73f7069fe6
commit f7fd63066f
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/drivers/pc80/tpm/acpi/tpm.asl
View File

@ -15,6 +15,8 @@
/* Trusted Platform Module */ /* Trusted Platform Module */
#if CONFIG_LPC_TPM
Device (TPM) Device (TPM)
{ {
Name (_HID, EISAID ("PNP0C31")) Name (_HID, EISAID ("PNP0C31"))
@ -41,7 +43,7 @@ Device (TPM)
Method (_STA, 0) Method (_STA, 0)
{ {
#if CONFIG_LPC_TPM && !CONFIG_TPM_DEACTIVATE #if !CONFIG_TPM_DEACTIVATE
If (LAnd (LGreater (DVID, 0), LLess (DVID, 0xffffffff))) { If (LAnd (LGreater (DVID, 0), LLess (DVID, 0xffffffff))) {
Return (0xf) Return (0xf)
} Else { } Else {
@ -213,3 +215,5 @@ Device (TPM)
Return (Buffer (1) { 0 }) Return (Buffer (1) { 0 })
} }
} }
#endif /* CONFIG_LPC_TPM */