acpi/tpm: update TPM preprocessor guards

Replace '#ifdef ENABLE_TPM' with '#if IS_ENABLED(CONFIG_LPC_TPM)'
for platforms which use a TPM on the LPC bus, so that the TPM
ACPI code isn't included when the Kconfig option is deselected.

Change-Id: Ia4c0d67dd3b044fe468002dff9eeb4f75f9934f9
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/22581
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Philipp Deppenwiese <zaolin.daisuki@gmail.com>
This commit is contained in:
Matt DeVillier 2017-01-14 19:23:34 -06:00 committed by Stefan Reinauer
parent 242ea84b01
commit 59bd6a4d60
5 changed files with 5 additions and 5 deletions

View File

@ -136,7 +136,7 @@ Device (LPCB)
// Include mainboard's superio.asl file. // Include mainboard's superio.asl file.
#include "acpi/superio.asl" #include "acpi/superio.asl"
#ifdef ENABLE_TPM #if IS_ENABLED(CONFIG_LPC_TPM)
Device (TPM) // Trusted Platform Module Device (TPM) // Trusted Platform Module
{ {
Name(_HID, EISAID("IFX0102")) Name(_HID, EISAID("IFX0102"))

View File

@ -138,7 +138,7 @@ Device (LPCB)
/* Include mainboard's superio.asl file. */ /* Include mainboard's superio.asl file. */
#include "acpi/superio.asl" #include "acpi/superio.asl"
#ifdef ENABLE_TPM #if IS_ENABLED(CONFIG_LPC_TPM)
Device (TPM) /* Trusted Platform Module */ Device (TPM) /* Trusted Platform Module */
{ {
Name(_HID, EISAID("IFX0102")) Name(_HID, EISAID("IFX0102"))

View File

@ -136,7 +136,7 @@ Device (LPCB)
// Include mainboard's superio.asl file. // Include mainboard's superio.asl file.
#include "acpi/superio.asl" #include "acpi/superio.asl"
#ifdef ENABLE_TPM #if IS_ENABLED(CONFIG_LPC_TPM)
Device (TPM) // Trusted Platform Module Device (TPM) // Trusted Platform Module
{ {
Name(_HID, EISAID("IFX0102")) Name(_HID, EISAID("IFX0102"))

View File

@ -199,7 +199,7 @@ Device (LPCB)
#include "acpi/superio.asl" #include "acpi/superio.asl"
#ifdef ENABLE_TPM #if IS_ENABLED(CONFIG_LPC_TPM)
Device (TPM) // Trusted Platform Module Device (TPM) // Trusted Platform Module
{ {
Name(_HID, EISAID("IFX0102")) Name(_HID, EISAID("IFX0102"))

View File

@ -224,7 +224,7 @@ Device (LPCB)
#include "acpi/superio.asl" #include "acpi/superio.asl"
#ifdef ENABLE_TPM #if IS_ENABLED(CONFIG_LPC_TPM)
Device (TPM) // Trusted Platform Module Device (TPM) // Trusted Platform Module
{ {
Name(_HID, EISAID("IFX0102")) Name(_HID, EISAID("IFX0102"))