[coreboot-gerrit] New patch to review for coreboot: 60b7567 lenovo/x201: Reinit CBMEM only on S3 resume.
Vladimir Serbinenko (phcoder@gmail.com)
gerrit at coreboot.org
Wed Jan 22 21:42:23 CET 2014
Vladimir Serbinenko (phcoder at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4782
-gerrit
commit 60b7567caf357b605257fada16c7691b3c02d8fb
Author: Vladimir Serbinenko <phcoder at gmail.com>
Date: Wed Jan 22 21:41:34 2014 +0100
lenovo/x201: Reinit CBMEM only on S3 resume.
Change-Id: I0643cdab10cda3f19ab56223f5fa77376a8046ac
Signed-off-by: Vladimir Serbinenko <phcoder at gmail.com>
---
src/mainboard/lenovo/x201/romstage.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/mainboard/lenovo/x201/romstage.c b/src/mainboard/lenovo/x201/romstage.c
index 5dc75a0..c3e2d4c 100644
--- a/src/mainboard/lenovo/x201/romstage.c
+++ b/src/mainboard/lenovo/x201/romstage.c
@@ -325,11 +325,9 @@ void main(unsigned long bist)
outl(reg32 & ~(7 << 10), DEFAULT_PMBASE + 0x04);
}
- /* FIXME: If not in s3resume, raminit() calls cbmem_recovery(0),
- * clears all of CBMEM region and puts in MRC training results.
- * Tell here we are doing resume to avoid wiping CBMEM region
- * again. */
- cbmem_initted = !cbmem_recovery(1);
+ /* For non-S3-resume, CBMEM is inited in raminit code. */
+ if (s3resume)
+ cbmem_initted = !cbmem_recovery(1);
#if CONFIG_HAVE_ACPI_RESUME
/* If there is no high memory area, we didn't boot before, so
More information about the coreboot-gerrit
mailing list