From b16f09238df063f3f829f34997aa8200af990acc Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sat, 7 Jun 2014 16:27:27 +0200 Subject: nehalem: Move cbmem_recovery call to raminit. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently cbmem_recovery is done in raminit only on non-S3-resume path do it on both paths to reduce confusion. Change-Id: I16161ad449b9802a855fcf834aa721f4f65c0bb4 Signed-off-by: Vladimir Serbinenko Reviewed-on: http://review.coreboot.org/5954 Reviewed-by: Kyösti Mälkki Tested-by: build bot (Jenkins) --- src/mainboard/packardbell/ms2290/romstage.c | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src/mainboard/packardbell/ms2290') diff --git a/src/mainboard/packardbell/ms2290/romstage.c b/src/mainboard/packardbell/ms2290/romstage.c index 79afae301e..2ca520d267 100644 --- a/src/mainboard/packardbell/ms2290/romstage.c +++ b/src/mainboard/packardbell/ms2290/romstage.c @@ -306,16 +306,6 @@ void main(unsigned long bist) if (s3resume) { void *resume_backup_memory; - /* For non-S3-resume, CBMEM is inited in raminit code. */ - if (cbmem_recovery(1)) { - printk(BIOS_ERR, "Failed S3 resume.\n"); - ram_check(0x100000, 0x200000); - - /* Failed S3 resume, reset to come up cleanly */ - outb(0xe, 0xcf9); - hlt(); - } - resume_backup_memory = cbmem_find(CBMEM_ID_RESUME); /* copy 1MB - 64K to high tables ram_base to prevent memory corruption -- cgit v1.2.3