GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/hardwaremain: Drop HAVE_ACPI_RESUME guards 

Header was moved outside arch/.

Change-Id: I1f2f0d96d49b5d921f77512ad5e2bf3f60adb484
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42457
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
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 3635c39237
commit 61ab3fe6ef
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/lib/hardwaremain.c
View File

@ -6,6 +6,7 @@
*/ */
#include <adainit.h> #include <adainit.h>
#include <acpi/acpi.h>
#include <arch/exception.h> #include <arch/exception.h>
#include <bootstate.h> #include <bootstate.h>
#include <console/console.h> #include <console/console.h>
@ -19,9 +20,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <boot/tables.h> #include <boot/tables.h>
#include <program_loading.h> #include <program_loading.h>
#if CONFIG(HAVE_ACPI_RESUME)
#include <acpi/acpi.h>
#endif
#include <timer.h> #include <timer.h>
#include <timestamp.h> #include <timestamp.h>
#include <thread.h> #include <thread.h>
@ -151,16 +149,16 @@ static boot_state_t bs_post_device(void *arg)
static boot_state_t bs_os_resume_check(void *arg) static boot_state_t bs_os_resume_check(void *arg)
{ {
#if CONFIG(HAVE_ACPI_RESUME) void *wake_vector = NULL;
void *wake_vector;
wake_vector = acpi_find_wakeup_vector(); if (CONFIG(HAVE_ACPI_RESUME))
wake_vector = acpi_find_wakeup_vector();
if (wake_vector != NULL) { if (wake_vector != NULL) {
boot_states[BS_OS_RESUME].arg = wake_vector; boot_states[BS_OS_RESUME].arg = wake_vector;
return BS_OS_RESUME; return BS_OS_RESUME;
} }
#endif
timestamp_add_now(TS_CBMEM_POST); timestamp_add_now(TS_CBMEM_POST);
return BS_WRITE_TABLES; return BS_WRITE_TABLES;
@ -168,10 +166,11 @@ static boot_state_t bs_os_resume_check(void *arg)
static boot_state_t bs_os_resume(void *wake_vector) static boot_state_t bs_os_resume(void *wake_vector)
{ {
#if CONFIG(HAVE_ACPI_RESUME) if (CONFIG(HAVE_ACPI_RESUME)) {
arch_bootstate_coreboot_exit(); arch_bootstate_coreboot_exit();
acpi_resume(wake_vector); acpi_resume(wake_vector);
#endif }
return BS_WRITE_TABLES; return BS_WRITE_TABLES;
} }
@ -445,9 +444,7 @@ void main(void)
post_code(POST_ENTRY_RAMSTAGE); post_code(POST_ENTRY_RAMSTAGE);
/* Handoff sleep type from romstage. */ /* Handoff sleep type from romstage. */
#if CONFIG(HAVE_ACPI_RESUME)
acpi_is_wakeup(); acpi_is_wakeup();
#endif
threads_initialize(); threads_initialize();
/* Schedule the static boot state entries. */ /* Schedule the static boot state entries. */