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>
This commit is contained in:
@@ -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__
|
||||
|
Reference in New Issue
Block a user