Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/22581
Change subject: acpi/tpm: update TPM preprocessor guards ......................................................................
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 --- M src/soc/intel/baytrail/acpi/lpc.asl M src/soc/intel/braswell/acpi/lpc.asl M src/soc/intel/fsp_baytrail/acpi/lpc.asl M src/southbridge/intel/i82801gx/acpi/lpc.asl M src/southbridge/intel/lynxpoint/acpi/lpc.asl 5 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/22581/1
diff --git a/src/soc/intel/baytrail/acpi/lpc.asl b/src/soc/intel/baytrail/acpi/lpc.asl index 9512032..23048f2 100644 --- a/src/soc/intel/baytrail/acpi/lpc.asl +++ b/src/soc/intel/baytrail/acpi/lpc.asl @@ -136,7 +136,7 @@ // Include mainboard's superio.asl file. #include "acpi/superio.asl"
-#ifdef ENABLE_TPM +#if IS_ENABLED(CONFIG_LPC_TPM) Device (TPM) // Trusted Platform Module { Name(_HID, EISAID("IFX0102")) diff --git a/src/soc/intel/braswell/acpi/lpc.asl b/src/soc/intel/braswell/acpi/lpc.asl index bf0ba4b..e6b8cc9 100644 --- a/src/soc/intel/braswell/acpi/lpc.asl +++ b/src/soc/intel/braswell/acpi/lpc.asl @@ -138,7 +138,7 @@ /* Include mainboard's superio.asl file. */ #include "acpi/superio.asl"
-#ifdef ENABLE_TPM +#if IS_ENABLED(CONFIG_LPC_TPM) Device (TPM) /* Trusted Platform Module */ { Name(_HID, EISAID("IFX0102")) diff --git a/src/soc/intel/fsp_baytrail/acpi/lpc.asl b/src/soc/intel/fsp_baytrail/acpi/lpc.asl index 9512032..23048f2 100644 --- a/src/soc/intel/fsp_baytrail/acpi/lpc.asl +++ b/src/soc/intel/fsp_baytrail/acpi/lpc.asl @@ -136,7 +136,7 @@ // Include mainboard's superio.asl file. #include "acpi/superio.asl"
-#ifdef ENABLE_TPM +#if IS_ENABLED(CONFIG_LPC_TPM) Device (TPM) // Trusted Platform Module { Name(_HID, EISAID("IFX0102")) diff --git a/src/southbridge/intel/i82801gx/acpi/lpc.asl b/src/southbridge/intel/i82801gx/acpi/lpc.asl index 67cbc05..f080b6a 100644 --- a/src/southbridge/intel/i82801gx/acpi/lpc.asl +++ b/src/southbridge/intel/i82801gx/acpi/lpc.asl @@ -199,7 +199,7 @@
#include "acpi/superio.asl"
-#ifdef ENABLE_TPM +#if IS_ENABLED(CONFIG_LPC_TPM) Device (TPM) // Trusted Platform Module { Name(_HID, EISAID("IFX0102")) diff --git a/src/southbridge/intel/lynxpoint/acpi/lpc.asl b/src/southbridge/intel/lynxpoint/acpi/lpc.asl index aa83981..3e13ac3 100644 --- a/src/southbridge/intel/lynxpoint/acpi/lpc.asl +++ b/src/southbridge/intel/lynxpoint/acpi/lpc.asl @@ -224,7 +224,7 @@
#include "acpi/superio.asl"
-#ifdef ENABLE_TPM +#if IS_ENABLED(CONFIG_LPC_TPM) Device (TPM) // Trusted Platform Module { Name(_HID, EISAID("IFX0102"))