[coreboot-gerrit] Patch set updated for coreboot: tpm/acpi/tpm.asl: Only include tpm.asl if tpm is enabled

[Martin Roth (martinroth@google.com)]

Martin Roth (martinroth at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13890

-gerrit

commit 6ce5a8384321da7c80cb89b437b095dbc33440c4
Author: Martin Roth <martinroth at google.com>
Date:   Thu Mar 3 16:20:53 2016 -0700

    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 at google.com>
---
 src/drivers/pc80/tpm/acpi/tpm.asl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/drivers/pc80/tpm/acpi/tpm.asl b/src/drivers/pc80/tpm/acpi/tpm.asl
index de25114..090bf4c 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 */