Nico Huber (nico.h@gmx.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/12420
-gerrit
commit fcdaf7a398143f4590b3023ccde426a7fcf55390 Author: Nico Huber nico.h@gmx.de Date: Thu Nov 12 20:16:18 2015 +0100
mb/roda/rk9: Fix cbmem recovery on resume path
By calling cbmem_recovery() with `0`, we rewrote the cbmem table even on the resume path. By that, we lost the OS' resume vector and ended up loading the payload.
Change-Id: Ic24a12d4143d6924321b1d01f07a467c58c4e9ea Signed-off-by: Nico Huber nico.h@gmx.de --- src/mainboard/roda/rk9/romstage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mainboard/roda/rk9/romstage.c b/src/mainboard/roda/rk9/romstage.c index 4066240..e055be9 100644 --- a/src/mainboard/roda/rk9/romstage.c +++ b/src/mainboard/roda/rk9/romstage.c @@ -186,7 +186,7 @@ void main(unsigned long bist)
init_iommu();
- cbmem_initted = !cbmem_recovery(0); + cbmem_initted = !cbmem_recovery(s3resume); #if CONFIG_HAVE_ACPI_RESUME /* If there is no high memory area, we didn't boot before, so * this is not a resume. In that case we just create the cbmem toc.