sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ACPI,drivers/: Do not guard <acpi/acpi.h>

Browse Source 
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>
This commit is contained in:
Kyösti Mälkki
2020-06-17 14:17:41 +03:00
committed by Angel Pons
parent c5853e95f2
commit 3635c39237
2 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/drivers/elog/elog.c
View File

@@ -1,8 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#if CONFIG(HAVE_ACPI_RESUME)
#include <acpi/acpi.h> #include <acpi/acpi.h>
#endif
#include <bootstate.h> #include <bootstate.h>
#include <cbmem.h> #include <cbmem.h>
#include <console/console.h> #include <console/console.h>
@@ -738,11 +736,7 @@ static bool elog_do_add_boot_count(void)
if (ENV_SMM) if (ENV_SMM)
return false; return false;
#if CONFIG(HAVE_ACPI_RESUME)
return !acpi_is_wakeup_s3(); return !acpi_is_wakeup_s3();
#else
return true;
#endif
} }
/* Check and log POST codes from previous boot */ /* Check and log POST codes from previous boot */

11
src/drivers/tpm/tpm.c
View File

@@ -1,23 +1,14 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <acpi/acpi.h>
#include <types.h> #include <types.h>
#include <bootstate.h> #include <bootstate.h>
#include <security/tpm/tspi.h> #include <security/tpm/tspi.h>
#if CONFIG(HAVE_ACPI_RESUME)
#include <acpi/acpi.h>
#endif
static void init_tpm_dev(void *unused) static void init_tpm_dev(void *unused)
{ {
#if CONFIG(HAVE_ACPI_RESUME)
int s3resume = acpi_is_wakeup_s3(); int s3resume = acpi_is_wakeup_s3();
tpm_setup(s3resume); 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); BOOT_STATE_INIT_ENTRY(BS_DEV_INIT, BS_ON_ENTRY, init_tpm_dev, NULL);