ACPI: Drop some HAVE_ACPI_RESUME preprocessor use
Change-Id: Idfb89ceabac6b6906e31a3dbe9096d48ba680599 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/42458 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Furquan Shaikh <furquan@google.com>
This commit is contained in:
parent
df99d13f25
commit
a9f881d039
|
@ -145,12 +145,10 @@ void raminit(struct romstage_params *params)
|
|||
fsp_reserved_bytes);
|
||||
} else if (cbmem_initialize_id_size(CBMEM_ID_FSP_RESERVED_MEMORY,
|
||||
fsp_reserved_bytes)) {
|
||||
#if CONFIG(HAVE_ACPI_RESUME)
|
||||
printk(BIOS_DEBUG, "Failed to recover CBMEM in S3 resume.\n");
|
||||
/* Failed S3 resume, reset to come up cleanly */
|
||||
/* FIXME: A "system" reset is likely enough: */
|
||||
full_reset();
|
||||
#endif
|
||||
}
|
||||
|
||||
/* Save the FSP runtime parameters. */
|
||||
|
|
|
@ -166,11 +166,9 @@ void raminit(struct mrc_params *mp, int prev_sleep_state)
|
|||
if (prev_sleep_state != ACPI_S3) {
|
||||
cbmem_initialize_empty();
|
||||
} else if (cbmem_initialize()) {
|
||||
#if CONFIG(HAVE_ACPI_RESUME)
|
||||
printk(BIOS_DEBUG, "Failed to recover CBMEM in S3 resume.\n");
|
||||
/* Failed S3 resume, reset to come up cleanly */
|
||||
system_reset();
|
||||
#endif
|
||||
}
|
||||
|
||||
print_dram_info(mp->mainboard.dram_data[0]);
|
||||
|
|
|
@ -91,11 +91,9 @@ void raminit(struct pei_data *pei_data)
|
|||
if (pei_data->boot_mode != ACPI_S3) {
|
||||
cbmem_initialize_empty();
|
||||
} else if (cbmem_initialize()) {
|
||||
#if CONFIG(HAVE_ACPI_RESUME)
|
||||
printk(BIOS_DEBUG, "Failed to recover CBMEM in S3 resume.\n");
|
||||
/* Failed S3 resume, reset to come up cleanly */
|
||||
system_reset();
|
||||
#endif
|
||||
}
|
||||
|
||||
printk(BIOS_DEBUG, "MRC data at %p %d bytes\n", pei_data->data_to_save,
|
||||
|
|
|
@ -1,14 +1,11 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
|
||||
#include <acpi/acpi.h>
|
||||
#include <bootstate.h>
|
||||
#include <console/console.h>
|
||||
#include <elog.h>
|
||||
#include <security/vboot/vboot_common.h>
|
||||
|
||||
#if CONFIG(HAVE_ACPI_RESUME)
|
||||
#include <acpi/acpi.h>
|
||||
#endif
|
||||
|
||||
static void elog_add_boot_reason(void *unused)
|
||||
{
|
||||
int rec = vboot_recovery_mode_enabled();
|
||||
|
@ -28,11 +25,9 @@ static void elog_add_boot_reason(void *unused)
|
|||
if (dev) {
|
||||
int log_event = 1;
|
||||
|
||||
#if CONFIG(HAVE_ACPI_RESUME)
|
||||
/* Skip logging developer mode in ACPI resume path */
|
||||
if (acpi_is_wakeup())
|
||||
log_event = 0;
|
||||
#endif
|
||||
|
||||
if (log_event) {
|
||||
elog_add_event(ELOG_TYPE_CROS_DEVELOPER_MODE);
|
||||
|
|
Loading…
Reference in New Issue