diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2015-01-09 23:48:47 +0200 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2015-01-10 13:53:51 +0100 |
| commit | 78c5d584a087265e44b076647db19efd4db4a7bb (patch) | |
| tree | 0f5e32c90cf0fb17db36d514baf6afc9c037d728 /src/northbridge/amd | |
| parent | 2320cbebc667ac6871d4d6c8b59fee27ba6e75e5 (diff) | |
ACPI: Add acpi_is_wakeup_s3() for romstage
This replaces acpi_is_wakeup_early().
Change-Id: I23112c1fc7b6f99584bc065fbf6b10fb073b1eb6
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/8187
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Diffstat (limited to 'src/northbridge/amd')
| -rw-r--r-- | src/northbridge/amd/amdk8/raminit.c | 6 | ||||
| -rw-r--r-- | src/northbridge/amd/amdk8/raminit_f.c | 7 |
2 files changed, 3 insertions, 10 deletions
diff --git a/src/northbridge/amd/amdk8/raminit.c b/src/northbridge/amd/amdk8/raminit.c index 19f83b998e..4213cfb3a2 100644 --- a/src/northbridge/amd/amdk8/raminit.c +++ b/src/northbridge/amd/amdk8/raminit.c @@ -2349,11 +2349,7 @@ static void sdram_enable(int controllers, const struct mem_controller *ctrl) { int i; u32 whatWait = 0; -#if CONFIG_HAVE_ACPI_RESUME - int suspend = acpi_is_wakeup_early(); -#else - int suspend = 0; -#endif + int suspend = acpi_is_wakeup_s3(); /* Error if I don't have memory */ if (memory_end_k(ctrl, controllers) == 0) { diff --git a/src/northbridge/amd/amdk8/raminit_f.c b/src/northbridge/amd/amdk8/raminit_f.c index b8417a6203..92d7f136b4 100644 --- a/src/northbridge/amd/amdk8/raminit_f.c +++ b/src/northbridge/amd/amdk8/raminit_f.c @@ -26,6 +26,7 @@ #include <cpu/amd/mtrr.h> #include <stdlib.h> +#include <arch/acpi.h> #include "raminit.h" #include "f.h" #include <spd_ddr2.h> @@ -3017,11 +3018,7 @@ static void sdram_enable(int controllers, const struct mem_controller *ctrl, struct sys_info *sysinfo) { int i; -#if CONFIG_HAVE_ACPI_RESUME - int suspend = acpi_is_wakeup_early(); -#else - int suspend = 0; -#endif + int suspend = acpi_is_wakeup_s3(); #if K8_REV_F_SUPPORT_F0_F1_WORKAROUND == 1 unsigned cpu_f0_f1[8]; |