aboutsummaryrefslogtreecommitdiff
path: root/src/cpu/intel/haswell/romstage.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/cpu/intel/haswell/romstage.c')
-rw-r--r--src/cpu/intel/haswell/romstage.c19
1 files changed, 2 insertions, 17 deletions
diff --git a/src/cpu/intel/haswell/romstage.c b/src/cpu/intel/haswell/romstage.c
index 0e8fd09837..11d449c1ae 100644
--- a/src/cpu/intel/haswell/romstage.c
+++ b/src/cpu/intel/haswell/romstage.c
@@ -273,29 +273,14 @@ void romstage_common(const struct romstage_params *params)
}
}
-static inline void prepare_for_resume(struct romstage_handoff *handoff)
-{
-/* Only need to save memory when ramstage isn't relocatable. */
-#if !CONFIG_RELOCATABLE_RAMSTAGE
-#if CONFIG_HAVE_ACPI_RESUME
- /* Back up the OS-controlled memory where ramstage will be loaded. */
- if (handoff != NULL && handoff->s3_resume) {
- void *src = (void *)CONFIG_RAMBASE;
- void *dest = cbmem_find(CBMEM_ID_RESUME);
- if (dest != NULL)
- memcpy(dest, src, HIGH_MEMORY_SAVE);
- }
-#endif
-#endif
-}
-
void romstage_after_car(void)
{
struct romstage_handoff *handoff;
handoff = romstage_handoff_find_or_add();
- prepare_for_resume(handoff);
+ if (handoff != NULL && handoff->s3_resume)
+ acpi_prepare_for_resume();
/* Load the ramstage. */
copy_and_run();