aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2020-06-16 12:45:11 +0300
committerAngel Pons <th3fanbus@gmail.com>2020-06-18 12:54:46 +0000
commitc5853e95f2c7a1d70005e98d1d7653cdee7c9e76 (patch)
tree0345da1223ba6aaf3588805ec9d1cbb36a5a4aad
parent000d91af00af762b4ddc52f574a25e18c7aa1a0b (diff)
ACPI: Clean up some S3 related leftovers
With RELOCATABLE_RAMSTAGE the backing up of low memory on S3 resume path was dropped. We forgot some things behind. Change-Id: I674f23dade0095e64619af0ae81e23368b1ee471 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/42422 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Angel Pons <th3fanbus@gmail.com>
-rw-r--r--src/arch/x86/acpi_s3.c4
-rw-r--r--src/include/program_loading.h4
2 files changed, 1 insertions, 7 deletions
diff --git a/src/arch/x86/acpi_s3.c b/src/arch/x86/acpi_s3.c
index 5ef0f7a6c8..d4c697ebbf 100644
--- a/src/arch/x86/acpi_s3.c
+++ b/src/arch/x86/acpi_s3.c
@@ -6,12 +6,10 @@
#include <arch/cpu.h>
#include <cbmem.h>
#include <commonlib/helpers.h>
+#include <cpu/x86/smm.h>
#include <fallback.h>
#include <timestamp.h>
-#include <program_loading.h>
#include <romstage_handoff.h>
-#include <symbols.h>
-#include <cpu/x86/smm.h>
#if ENV_RAMSTAGE || ENV_POSTCAR
diff --git a/src/include/program_loading.h b/src/include/program_loading.h
index 72e8cf6445..fae70ce46b 100644
--- a/src/include/program_loading.h
+++ b/src/include/program_loading.h
@@ -174,10 +174,6 @@ int legacy_romstage_selector(struct prog *romstage);
/* Run ramstage from romstage. */
void run_ramstage(void);
-/* Backup OS memory to CBMEM_ID_RESUME on ACPI S3 resume path,
- * if ramstage overwrites low memory. */
-void backup_ramstage_section(uintptr_t base, size_t size);
-
/***********************
* PAYLOAD LOADING *
***********************/