From 3635c39237a776cff284118867212a084309d2b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Wed, 17 Jun 2020 14:17:41 +0300
Subject: ACPI,drivers/: Do not guard <acpi/acpi.h>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Header was moved outside arch/.

Change-Id: Id96c2bdcee49cddab6610c7e2cd6f07638279256
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42456
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
---
 src/drivers/elog/elog.c |  6 ------
 src/drivers/tpm/tpm.c   | 11 +----------
 2 files changed, 1 insertion(+), 16 deletions(-)

(limited to 'src/drivers')

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);
-- 
cgit v1.2.3