summaryrefslogtreecommitdiff
path: root/src/lib/cbmem.c
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2014-01-03 15:15:22 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2014-01-06 17:33:10 +0100
commitcb28f3f8ed13cdd9ae17441dacf6409eaf390105 (patch)
treef68b47e1fc90a292139ffeb00660defb831a2cb2 /src/lib/cbmem.c
parent8526c3a4035c61e65814ef1fbe69b26311440d0c (diff)
downloadcoreboot-cb28f3f8ed13cdd9ae17441dacf6409eaf390105.tar.xz
CBMEM ACPI: Move resume handler
Handler is ACPI/x86 specific so move details out of cbmem code. With static CBMEM initialisation, ramstage will need to test for S3 wakeup condition so publish also acpi_is_wakeup(). Change-Id: If591535448cdd24a54262b534c1a828fc13da759 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/4619 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Aaron Durbin <adurbin@google.com>
Diffstat (limited to 'src/lib/cbmem.c')
-rw-r--r--src/lib/cbmem.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/lib/cbmem.c b/src/lib/cbmem.c
index 6449b55a8e..e6d39132d4 100644
--- a/src/lib/cbmem.c
+++ b/src/lib/cbmem.c
@@ -228,12 +228,8 @@ int cbmem_initialize(void)
/* We expect the romstage to always initialize it. */
if (!cbmem_reinit()) {
-#if CONFIG_HAVE_ACPI_RESUME && !defined(__PRE_RAM__)
- /* Something went wrong, our high memory area got wiped */
- if (acpi_slp_type == 3 || acpi_slp_type == 2)
- acpi_slp_type = 0;
-#endif
cbmem_init();
+ cbmem_fail_resume();
rv = 1;
}
#ifndef __PRE_RAM__