summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/cpu/amd/pi/00630F01/model_15_init.c6
-rw-r--r--src/mainboard/amd/lamar/mainboard.c5
2 files changed, 2 insertions, 9 deletions
diff --git a/src/cpu/amd/pi/00630F01/model_15_init.c b/src/cpu/amd/pi/00630F01/model_15_init.c
index da64d76578..e2ba65e8c9 100644
--- a/src/cpu/amd/pi/00630F01/model_15_init.c
+++ b/src/cpu/amd/pi/00630F01/model_15_init.c
@@ -34,9 +34,7 @@
#include <cpu/x86/mtrr.h>
#include <cpu/amd/amdfam15.h>
#include <arch/acpi.h>
-#if CONFIG_HAVE_ACPI_RESUME
#include <cpu/amd/pi/s3_resume.h>
-#endif
static void model_15_init(device_t dev)
{
@@ -71,10 +69,8 @@ static void model_15_init(device_t dev)
msr.lo |= SYSCFG_MSR_MtrrFixDramEn;
wrmsr(SYSCFG_MSR, msr);
-#if CONFIG_HAVE_ACPI_RESUME
- if (acpi_slp_type == 3)
+ if (acpi_is_wakeup())
restore_mtrr();
-#endif
x86_mtrr_check();
x86_enable_cache();
diff --git a/src/mainboard/amd/lamar/mainboard.c b/src/mainboard/amd/lamar/mainboard.c
index 3b0be4ecbe..6d4bb0615a 100644
--- a/src/mainboard/amd/lamar/mainboard.c
+++ b/src/mainboard/amd/lamar/mainboard.c
@@ -158,11 +158,8 @@ static void mainboard_enable(device_t dev)
* The mainboard is the first place that we get control in ramstage. Check
* for S3 resume and call the approriate AGESA/CIMx resume functions.
*/
-#if CONFIG_HAVE_ACPI_RESUME
- acpi_slp_type = acpi_get_sleep_type();
- if (acpi_slp_type == 3)
+ if (acpi_is_wakeup_s3())
agesawrapper_fchs3earlyrestore();
-#endif
/* Initialize the PIRQ data structures for consumption */
pirq_setup();