summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2020-06-18 13:44:29 +0300
committerAngel Pons <th3fanbus@gmail.com>2020-11-19 22:58:11 +0000
commit4a3f67a9f22f52c2f495cf3708ffb2a92bd9fa70 (patch)
tree7cb45e365edfe4bf86eb67e254e6aeea0985d0cc /src/arch
parentdc5539fe16ba025e6ab6b1a964653d8a82069be7 (diff)
downloadcoreboot-4a3f67a9f22f52c2f495cf3708ffb2a92bd9fa70.tar.xz
ACPI S3: Split arch-agnostic parts
Change-Id: I9fc2d1cdbb280f781045882bc4ac98c67946953e Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/42614 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/x86/Makefile.inc2
-rw-r--r--src/arch/x86/acpi_s3.c31
2 files changed, 0 insertions, 33 deletions
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index a5c330905a..5157564847 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -158,7 +158,6 @@ endif # CONFIG_ARCH_VERSTAGE_X86_32 / CONFIG_ARCH_VERSTAGE_X86_64
ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32)$(CONFIG_ARCH_ROMSTAGE_X86_64),y)
-romstage-$(CONFIG_HAVE_ACPI_RESUME) += acpi_s3.c
romstage-y += boot.c
romstage-y += post.c
# gdt_init.S is included by entry32.inc when romstage is the first C
@@ -202,7 +201,6 @@ $(eval $(call create_class_compiler,postcar,x86_64))
endif
postcar-generic-ccopts += -D__POSTCAR__
-postcar-$(CONFIG_HAVE_ACPI_RESUME) += acpi_s3.c
postcar-y += boot.c
postcar-y += post.c
postcar-y += gdt_init.S
diff --git a/src/arch/x86/acpi_s3.c b/src/arch/x86/acpi_s3.c
index 1c304321a2..43a68f95f4 100644
--- a/src/arch/x86/acpi_s3.c
+++ b/src/arch/x86/acpi_s3.c
@@ -8,33 +8,6 @@
#include <cpu/x86/smm.h>
#include <fallback.h>
#include <timestamp.h>
-#include <romstage_handoff.h>
-
-#if ENV_RAMSTAGE || ENV_POSTCAR
-
-/* This is filled with acpi_is_wakeup_s3() call early in ramstage. */
-static int acpi_slp_type = -1;
-
-static void acpi_handoff_wakeup(void)
-{
- if (acpi_slp_type < 0) {
- if (romstage_handoff_is_resume()) {
- printk(BIOS_DEBUG, "S3 Resume\n");
- acpi_slp_type = ACPI_S3;
- } else {
- printk(BIOS_DEBUG, "Normal boot\n");
- acpi_slp_type = ACPI_S0;
- }
- }
-}
-
-int acpi_is_wakeup_s3(void)
-{
- acpi_handoff_wakeup();
- return (acpi_slp_type == ACPI_S3);
-}
-
-#endif /* ENV_RAMSTAGE */
#define WAKEUP_BASE 0x600
@@ -43,10 +16,6 @@ asmlinkage void (*acpi_do_wakeup)(uintptr_t vector) = (void *)WAKEUP_BASE;
extern unsigned char __wakeup;
extern unsigned int __wakeup_size;
-void __weak mainboard_suspend_resume(void)
-{
-}
-
void __noreturn acpi_resume(void *wake_vec)
{
/* Restore GNVS pointer in SMM if found. */