diff options
| author | Nico Huber <nico.h@gmx.de> | 2015-11-12 20:16:18 +0100 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2015-11-18 15:12:42 +0100 |
| commit | 8a44b0b18c8618189b6fb4522fce59582b3df43e (patch) | |
| tree | 4490e5f6fb6b961e7d540e58695197ec394326f0 | |
| parent | aad34cda4bc9c14ed10b00fe5da3f32233257913 (diff) | |
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>
Reviewed-on: http://review.coreboot.org/12420
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
| -rw-r--r-- | src/mainboard/roda/rk9/romstage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mainboard/roda/rk9/romstage.c b/src/mainboard/roda/rk9/romstage.c index 40662406ea..e055be955b 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. |