summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2020-06-17 14:34:50 +0300
committerAngel Pons <th3fanbus@gmail.com>2020-06-20 20:15:00 +0000
commita9f881d039985a468053b25036ef13bc786789bf (patch)
treeb89e0fb4786add6d691f0e1a092805bb7182478b /src/soc
parentdf99d13f258de07ada8a65316e4ebb70d1717899 (diff)
downloadcoreboot-a9f881d039985a468053b25036ef13bc786789bf.tar.xz
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>
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/intel/baytrail/romstage/raminit.c2
-rw-r--r--src/soc/intel/broadwell/romstage/raminit.c2
2 files changed, 0 insertions, 4 deletions
diff --git a/src/soc/intel/baytrail/romstage/raminit.c b/src/soc/intel/baytrail/romstage/raminit.c
index 1d1bd30d79..5cedf22c13 100644
--- a/src/soc/intel/baytrail/romstage/raminit.c
+++ b/src/soc/intel/baytrail/romstage/raminit.c
@@ -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]);
diff --git a/src/soc/intel/broadwell/romstage/raminit.c b/src/soc/intel/broadwell/romstage/raminit.c
index 8c194fcfa8..4165c678d2 100644
--- a/src/soc/intel/broadwell/romstage/raminit.c
+++ b/src/soc/intel/broadwell/romstage/raminit.c
@@ -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,