From bb805e156a6c464454ff1622a638e8ab768732bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Mon, 16 Jun 2014 09:14:49 +0300 Subject: nehalem boards: Use acpi_s3_resume_allowed() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also update packardbell/ms2290 to match lenovo/x201. Change-Id: I6bda740cadd81ebe47e57742c507bff322a9fb0e Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/6062 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan Reviewed-by: Marc Jones --- src/mainboard/lenovo/x201/romstage.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/mainboard/lenovo') 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 #include #include +#include #include #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"); + } } } -- cgit v1.2.3