summaryrefslogtreecommitdiff
path: root/src/arch/x86
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch/x86')
-rw-r--r--src/arch/x86/acpi_s3.c6
-rw-r--r--src/arch/x86/cbmem.c11
-rw-r--r--src/arch/x86/include/arch/acpi.h1
3 files changed, 0 insertions, 18 deletions
diff --git a/src/arch/x86/acpi_s3.c b/src/arch/x86/acpi_s3.c
index 5553b2cc41..52f8a201f7 100644
--- a/src/arch/x86/acpi_s3.c
+++ b/src/arch/x86/acpi_s3.c
@@ -60,12 +60,6 @@ int acpi_is_wakeup_s4(void)
acpi_handoff_wakeup();
return (acpi_slp_type == ACPI_S4);
}
-
-void acpi_fail_wakeup(void)
-{
- if (acpi_slp_type == ACPI_S3 || acpi_slp_type == ACPI_S2)
- acpi_slp_type = ACPI_S0;
-}
#endif /* ENV_RAMSTAGE */
#define WAKEUP_BASE 0x600
diff --git a/src/arch/x86/cbmem.c b/src/arch/x86/cbmem.c
index 648633f070..16c35b5dea 100644
--- a/src/arch/x86/cbmem.c
+++ b/src/arch/x86/cbmem.c
@@ -13,7 +13,6 @@
#include <stdlib.h>
#include <cbmem.h>
-#include <arch/acpi.h>
#if CONFIG(CBMEM_TOP_BACKUP)
@@ -35,13 +34,3 @@ void *cbmem_top(void)
}
#endif /* CBMEM_TOP_BACKUP */
-
-/* Something went wrong, our high memory area got wiped */
-void cbmem_fail_resume(void)
-{
-#if !defined(__PRE_RAM__) && CONFIG(HAVE_ACPI_RESUME)
- /* ACPI resume needs to be cleared in the fail-to-recover case, but that
- * condition is only handled during ramstage. */
- acpi_fail_wakeup();
-#endif
-}
diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h
index 14f0cdf9ab..42e45fb32f 100644
--- a/src/arch/x86/include/arch/acpi.h
+++ b/src/arch/x86/include/arch/acpi.h
@@ -932,7 +932,6 @@ unsigned long acpi_create_hest_error_source(acpi_hest_t *hest,
acpi_hest_esd_t *esd, u16 type, void *data, u16 len);
/* For ACPI S3 support. */
-void acpi_fail_wakeup(void);
void acpi_resume(void *wake_vec);
void mainboard_suspend_resume(void);
void *acpi_find_wakeup_vector(void);