summaryrefslogtreecommitdiff
path: root/src/mainboard/packardbell
diff options
context:
space:
mode:
authorVladimir Serbinenko <phcoder@gmail.com>2014-06-07 16:27:27 +0200
committerVladimir Serbinenko <phcoder@gmail.com>2014-07-19 16:00:50 +0200
commitb16f09238df063f3f829f34997aa8200af990acc (patch)
treeaefd73464d5d7e0bc8587eeb0c3c1bcb2cf742bb /src/mainboard/packardbell
parent4af1245ea1b3504c28bfc27b351af3195141631f (diff)
downloadcoreboot-b16f09238df063f3f829f34997aa8200af990acc.tar.xz
nehalem: Move cbmem_recovery call to raminit.
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 <phcoder@gmail.com> Reviewed-on: http://review.coreboot.org/5954 Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/mainboard/packardbell')
-rw-r--r--src/mainboard/packardbell/ms2290/romstage.c10
1 files changed, 0 insertions, 10 deletions
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