[coreboot-gerrit] Patch set updated for coreboot: e045599 google mainboards: Guard ACPI TPM Device with CONFIG_CHROMEOS

Duncan Laurie (dlaurie@chromium.org) gerrit at coreboot.org
Mon Feb 10 22:30:02 CET 2014


Duncan Laurie (dlaurie at chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5184

-gerrit

commit e045599e32678d0638dcea50216e9e900c897bca
Author: Duncan Laurie <dlaurie at chromium.org>
Date:   Mon Feb 10 12:17:30 2014 -0800

    google mainboards: Guard ACPI TPM Device with CONFIG_CHROMEOS
    
    The TPM is currently only configured/enabled/used if CONFIG_CHROMEOS
    is enabled, but the ACPI TPM device is defined always.
    
    If CONFIG_CHROMEOS is not defined then the Linux kernel will timeout
    trying to talk to the TPM on resume because it expects a defined TPM
    to be sent the TPM Resume command before returning to the OS.
    
    Change-Id: Ia1e88d52b94e74b0011810db24b114c1c7ff0cd8
    Signed-off-by: Duncan Laurie <dlaurie at chromium.org>
---
 src/mainboard/google/bolt/dsdt.asl   | 2 ++
 src/mainboard/google/falco/dsdt.asl  | 2 ++
 src/mainboard/google/peppy/dsdt.asl  | 2 ++
 src/mainboard/google/rambi/dsdt.asl  | 2 ++
 src/mainboard/google/slippy/dsdt.asl | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/src/mainboard/google/bolt/dsdt.asl b/src/mainboard/google/bolt/dsdt.asl
index 1316ebf..d976e7c 100644
--- a/src/mainboard/google/bolt/dsdt.asl
+++ b/src/mainboard/google/bolt/dsdt.asl
@@ -18,7 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#if CONFIG_CHROMEOS
 #define ENABLE_TPM
+#endif
 
 DefinitionBlock(
 	"dsdt.aml",
diff --git a/src/mainboard/google/falco/dsdt.asl b/src/mainboard/google/falco/dsdt.asl
index 1316ebf..d976e7c 100644
--- a/src/mainboard/google/falco/dsdt.asl
+++ b/src/mainboard/google/falco/dsdt.asl
@@ -18,7 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#if CONFIG_CHROMEOS
 #define ENABLE_TPM
+#endif
 
 DefinitionBlock(
 	"dsdt.aml",
diff --git a/src/mainboard/google/peppy/dsdt.asl b/src/mainboard/google/peppy/dsdt.asl
index 1316ebf..d976e7c 100644
--- a/src/mainboard/google/peppy/dsdt.asl
+++ b/src/mainboard/google/peppy/dsdt.asl
@@ -18,7 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#if CONFIG_CHROMEOS
 #define ENABLE_TPM
+#endif
 
 DefinitionBlock(
 	"dsdt.aml",
diff --git a/src/mainboard/google/rambi/dsdt.asl b/src/mainboard/google/rambi/dsdt.asl
index 172aaf4..3ebb60a 100644
--- a/src/mainboard/google/rambi/dsdt.asl
+++ b/src/mainboard/google/rambi/dsdt.asl
@@ -18,7 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#if CONFIG_CHROMEOS
 #define ENABLE_TPM
+#endif
 
 DefinitionBlock(
 	"dsdt.aml",
diff --git a/src/mainboard/google/slippy/dsdt.asl b/src/mainboard/google/slippy/dsdt.asl
index 1316ebf..d976e7c 100644
--- a/src/mainboard/google/slippy/dsdt.asl
+++ b/src/mainboard/google/slippy/dsdt.asl
@@ -18,7 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#if CONFIG_CHROMEOS
 #define ENABLE_TPM
+#endif
 
 DefinitionBlock(
 	"dsdt.aml",



More information about the coreboot-gerrit mailing list