From 59bd6a4d60c8bc5e8cbc0c23607f127e413ee17a Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Sat, 14 Jan 2017 19:23:34 -0600 Subject: [PATCH] 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 Reviewed-on: https://review.coreboot.org/22581 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Philipp Deppenwiese --- src/soc/intel/baytrail/acpi/lpc.asl | 2 +- src/soc/intel/braswell/acpi/lpc.asl | 2 +- src/soc/intel/fsp_baytrail/acpi/lpc.asl | 2 +- src/southbridge/intel/i82801gx/acpi/lpc.asl | 2 +- src/southbridge/intel/lynxpoint/acpi/lpc.asl | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/soc/intel/baytrail/acpi/lpc.asl b/src/soc/intel/baytrail/acpi/lpc.asl index 9512032b27..23048f2907 100644 --- a/src/soc/intel/baytrail/acpi/lpc.asl +++ b/src/soc/intel/baytrail/acpi/lpc.asl @@ -136,7 +136,7 @@ Device (LPCB) // 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 bf0ba4b698..e6b8cc9390 100644 --- a/src/soc/intel/braswell/acpi/lpc.asl +++ b/src/soc/intel/braswell/acpi/lpc.asl @@ -138,7 +138,7 @@ Device (LPCB) /* 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 9512032b27..23048f2907 100644 --- a/src/soc/intel/fsp_baytrail/acpi/lpc.asl +++ b/src/soc/intel/fsp_baytrail/acpi/lpc.asl @@ -136,7 +136,7 @@ Device (LPCB) // 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 67cbc056e3..f080b6af09 100644 --- a/src/southbridge/intel/i82801gx/acpi/lpc.asl +++ b/src/southbridge/intel/i82801gx/acpi/lpc.asl @@ -199,7 +199,7 @@ Device (LPCB) #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 aa839811ea..3e13ac342c 100644 --- a/src/southbridge/intel/lynxpoint/acpi/lpc.asl +++ b/src/southbridge/intel/lynxpoint/acpi/lpc.asl @@ -224,7 +224,7 @@ Device (LPCB) #include "acpi/superio.asl" -#ifdef ENABLE_TPM +#if IS_ENABLED(CONFIG_LPC_TPM) Device (TPM) // Trusted Platform Module { Name(_HID, EISAID("IFX0102"))