diff options
author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-01-06 17:20:31 +0200 |
---|---|---|
committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-01-22 20:54:57 +0100 |
commit | 2d8520b275d47e0670e7f9e166e0f63c32855548 (patch) | |
tree | 71b69480daeb5e800b3863448cd0776dba265b7c /src/mainboard/roda | |
parent | 97e1b11f416aa23787e71b6133702b82daf1552e (diff) | |
download | coreboot-2d8520b275d47e0670e7f9e166e0f63c32855548.tar.xz |
CBMEM: Replace cbmem_initialize() with cbmem_recovery()
The replacement function confirms CBMEM TOC is wiped clean on power
cycles and resets. It also introduces compatibility interface to ease
up transition to DYNAMIC_CBMEM.
Change-Id: Ic5445c5bff4aff22a43821f3064f2df458b9f250
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/4668
Reviewed-by: Aaron Durbin <adurbin@google.com>
Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/mainboard/roda')
-rw-r--r-- | src/mainboard/roda/rk886ex/romstage.c | 2 | ||||
-rw-r--r-- | src/mainboard/roda/rk9/romstage.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mainboard/roda/rk886ex/romstage.c b/src/mainboard/roda/rk886ex/romstage.c index e08c1c025f..ad323f5501 100644 --- a/src/mainboard/roda/rk886ex/romstage.c +++ b/src/mainboard/roda/rk886ex/romstage.c @@ -346,7 +346,7 @@ void main(unsigned long bist) MCHBAR16(SSKPD) = 0xCAFE; - cbmem_was_initted = !cbmem_initialize(); + cbmem_was_initted = !cbmem_recovery(boot_mode==2); #if CONFIG_HAVE_ACPI_RESUME /* If there is no high memory area, we didn't boot before, so diff --git a/src/mainboard/roda/rk9/romstage.c b/src/mainboard/roda/rk9/romstage.c index e71e9c4851..90392b9eb5 100644 --- a/src/mainboard/roda/rk9/romstage.c +++ b/src/mainboard/roda/rk9/romstage.c @@ -184,7 +184,7 @@ void main(unsigned long bist) init_iommu(); - cbmem_initted = !cbmem_initialize(); + cbmem_initted = !cbmem_recovery(0); #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. |