summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2014-06-16 09:14:49 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2014-06-20 19:51:04 +0200
commitbb805e156a6c464454ff1622a638e8ab768732bd (patch)
tree02fba65e15133d1005f99fd349af469399caf303
parent12d681b23f4c1e24cb31f5f253ec42290ca9c5ee (diff)
downloadcoreboot-bb805e156a6c464454ff1622a638e8ab768732bd.tar.xz
nehalem boards: Use acpi_s3_resume_allowed()
Also update packardbell/ms2290 to match lenovo/x201. Change-Id: I6bda740cadd81ebe47e57742c507bff322a9fb0e Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/6062 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com> Reviewed-by: Marc Jones <marc.jones@se-eng.com>
-rw-r--r--src/mainboard/lenovo/x201/romstage.c15
-rw-r--r--src/mainboard/packardbell/ms2290/romstage.c10
2 files changed, 16 insertions, 9 deletions
diff --git a/src/mainboard/lenovo/x201/romstage.c b/src/mainboard/lenovo/x201/romstage.c
index 1237a5cb7a..a18536aae4 100644
--- a/src/mainboard/lenovo/x201/romstage.c
+++ b/src/mainboard/lenovo/x201/romstage.c
@@ -36,6 +36,7 @@
#include <ec/acpi/ec.h>
#include <delay.h>
#include <timestamp.h>
+#include <arch/acpi.h>
#include <cbmem.h>
#include "gpio.h"
@@ -262,13 +263,13 @@ void main(unsigned long bist)
outl(reg32 & ~(7 << 10), DEFAULT_PMBASE + 0x04);
printk(BIOS_DEBUG, "Bad resume from S3 detected.\n");
} else {
-#if CONFIG_HAVE_ACPI_RESUME
- printk(BIOS_DEBUG, "Resume from S3 detected.\n");
- s3resume = 1;
-#else
- printk(BIOS_DEBUG,
- "Resume from S3 detected, but disabled.\n");
-#endif
+ if (acpi_s3_resume_allowed()) {
+ printk(BIOS_DEBUG, "Resume from S3 detected.\n");
+ s3resume = 1;
+ } else {
+ printk(BIOS_DEBUG,
+ "Resume from S3 detected, but disabled.\n");
+ }
}
}
diff --git a/src/mainboard/packardbell/ms2290/romstage.c b/src/mainboard/packardbell/ms2290/romstage.c
index 6a18dd6f79..79afae301e 100644
--- a/src/mainboard/packardbell/ms2290/romstage.c
+++ b/src/mainboard/packardbell/ms2290/romstage.c
@@ -36,6 +36,7 @@
#include <ec/acpi/ec.h>
#include <delay.h>
#include <timestamp.h>
+#include <arch/acpi.h>
#include <cbmem.h>
#include "arch/early_variables.h"
@@ -252,8 +253,13 @@ void main(unsigned long bist)
outl(reg32 & ~(7 << 10), DEFAULT_PMBASE + 0x04);
printk(BIOS_DEBUG, "Bad resume from S3 detected.\n");
} else {
- printk(BIOS_DEBUG, "Resume from S3 detected.\n");
- s3resume = 1;
+ if (acpi_s3_resume_allowed()) {
+ printk(BIOS_DEBUG, "Resume from S3 detected.\n");
+ s3resume = 1;
+ } else {
+ printk(BIOS_DEBUG,
+ "Resume from S3 detected, but disabled.\n");
+ }
}
}