<p>Matt DeVillier has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/22581">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">acpi/tpm: update TPM preprocessor guards<br><br>Replace '#ifdef ENABLE_TPM' with '#if IS_ENABLED(CONFIG_LPC_TPM)'<br>for platforms which use a TPM on the LPC bus, so that the TPM<br>ACPI code isn't included when the Kconfig option is deselected.<br><br>Change-Id: Ia4c0d67dd3b044fe468002dff9eeb4f75f9934f9<br>Signed-off-by: Matt DeVillier <matt.devillier@gmail.com><br>---<br>M src/soc/intel/baytrail/acpi/lpc.asl<br>M src/soc/intel/braswell/acpi/lpc.asl<br>M src/soc/intel/fsp_baytrail/acpi/lpc.asl<br>M src/southbridge/intel/i82801gx/acpi/lpc.asl<br>M src/southbridge/intel/lynxpoint/acpi/lpc.asl<br>5 files changed, 5 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/22581/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/soc/intel/baytrail/acpi/lpc.asl b/src/soc/intel/baytrail/acpi/lpc.asl<br>index 9512032..23048f2 100644<br>--- a/src/soc/intel/baytrail/acpi/lpc.asl<br>+++ b/src/soc/intel/baytrail/acpi/lpc.asl<br>@@ -136,7 +136,7 @@<br>        // Include mainboard's superio.asl file.<br>  #include "acpi/superio.asl"<br> <br>-#ifdef ENABLE_TPM<br>+#if IS_ENABLED(CONFIG_LPC_TPM)<br>         Device (TPM)            // Trusted Platform Module<br>    {<br>             Name(_HID, EISAID("IFX0102"))<br>diff --git a/src/soc/intel/braswell/acpi/lpc.asl b/src/soc/intel/braswell/acpi/lpc.asl<br>index bf0ba4b..e6b8cc9 100644<br>--- a/src/soc/intel/braswell/acpi/lpc.asl<br>+++ b/src/soc/intel/braswell/acpi/lpc.asl<br>@@ -138,7 +138,7 @@<br>     /* Include mainboard's superio.asl file. */<br>       #include "acpi/superio.asl"<br> <br>-#ifdef ENABLE_TPM<br>+#if IS_ENABLED(CONFIG_LPC_TPM)<br>         Device (TPM)            /* Trusted Platform Module */<br>         {<br>             Name(_HID, EISAID("IFX0102"))<br>diff --git a/src/soc/intel/fsp_baytrail/acpi/lpc.asl b/src/soc/intel/fsp_baytrail/acpi/lpc.asl<br>index 9512032..23048f2 100644<br>--- a/src/soc/intel/fsp_baytrail/acpi/lpc.asl<br>+++ b/src/soc/intel/fsp_baytrail/acpi/lpc.asl<br>@@ -136,7 +136,7 @@<br>     // Include mainboard's superio.asl file.<br>  #include "acpi/superio.asl"<br> <br>-#ifdef ENABLE_TPM<br>+#if IS_ENABLED(CONFIG_LPC_TPM)<br>         Device (TPM)            // Trusted Platform Module<br>    {<br>             Name(_HID, EISAID("IFX0102"))<br>diff --git a/src/southbridge/intel/i82801gx/acpi/lpc.asl b/src/southbridge/intel/i82801gx/acpi/lpc.asl<br>index 67cbc05..f080b6a 100644<br>--- a/src/southbridge/intel/i82801gx/acpi/lpc.asl<br>+++ b/src/southbridge/intel/i82801gx/acpi/lpc.asl<br>@@ -199,7 +199,7 @@<br> <br>  #include "acpi/superio.asl"<br> <br>-#ifdef ENABLE_TPM<br>+#if IS_ENABLED(CONFIG_LPC_TPM)<br>         Device (TPM)            // Trusted Platform Module<br>    {<br>             Name(_HID, EISAID("IFX0102"))<br>diff --git a/src/southbridge/intel/lynxpoint/acpi/lpc.asl b/src/southbridge/intel/lynxpoint/acpi/lpc.asl<br>index aa83981..3e13ac3 100644<br>--- a/src/southbridge/intel/lynxpoint/acpi/lpc.asl<br>+++ b/src/southbridge/intel/lynxpoint/acpi/lpc.asl<br>@@ -224,7 +224,7 @@<br> <br>      #include "acpi/superio.asl"<br> <br>-#ifdef ENABLE_TPM<br>+#if IS_ENABLED(CONFIG_LPC_TPM)<br>         Device (TPM)            // Trusted Platform Module<br>    {<br>             Name(_HID, EISAID("IFX0102"))<br></pre><p>To view, visit <a href="https://review.coreboot.org/22581">change 22581</a>. To unsubscribe, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/22581"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ia4c0d67dd3b044fe468002dff9eeb4f75f9934f9 </div>
<div style="display:none"> Gerrit-Change-Number: 22581 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Matt DeVillier <matt.devillier@gmail.com> </div>