From c5853e95f2c7a1d70005e98d1d7653cdee7c9e76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Tue, 16 Jun 2020 12:45:11 +0300
Subject: ACPI: Clean up some S3 related leftovers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/arch/x86/acpi_s3.c        | 4 +---
 src/include/program_loading.h | 4 ----
 2 files changed, 1 insertion(+), 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   *
  ***********************/
-- 
cgit v1.2.3