summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/drivers/elog/elog.c6
-rw-r--r--src/drivers/tpm/tpm.c11
2 files changed, 1 insertions, 16 deletions
diff --git a/src/drivers/elog/elog.c b/src/drivers/elog/elog.c
index a08624fe74..01fa9cce65 100644
--- a/src/drivers/elog/elog.c
+++ b/src/drivers/elog/elog.c
@@ -1,8 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#if CONFIG(HAVE_ACPI_RESUME)
#include <acpi/acpi.h>
-#endif
#include <bootstate.h>
#include <cbmem.h>
#include <console/console.h>
@@ -738,11 +736,7 @@ static bool elog_do_add_boot_count(void)
if (ENV_SMM)
return false;
-#if CONFIG(HAVE_ACPI_RESUME)
return !acpi_is_wakeup_s3();
-#else
- return true;
-#endif
}
/* Check and log POST codes from previous boot */
diff --git a/src/drivers/tpm/tpm.c b/src/drivers/tpm/tpm.c
index d3485bbec9..f9f9c4854c 100644
--- a/src/drivers/tpm/tpm.c
+++ b/src/drivers/tpm/tpm.c
@@ -1,23 +1,14 @@
/* SPDX-License-Identifier: GPL-2.0-only */
+#include <acpi/acpi.h>
#include <types.h>
#include <bootstate.h>
#include <security/tpm/tspi.h>
-#if CONFIG(HAVE_ACPI_RESUME)
-#include <acpi/acpi.h>
-#endif
-
static void init_tpm_dev(void *unused)
{
-#if CONFIG(HAVE_ACPI_RESUME)
int s3resume = acpi_is_wakeup_s3();
tpm_setup(s3resume);
-#else
- /* This can lead to PCR reset attacks but currently there
- is no generic way to detect resume on other platforms. */
- tpm_setup(false);
-#endif
}
BOOT_STATE_INIT_ENTRY(BS_DEV_INIT, BS_ON_ENTRY, init_tpm_dev, NULL);