[coreboot-gerrit] New patch to review for coreboot: 78e1348 roda/rk9: Add EARLY_CBMEM_INIT
Kyösti Mälkki (kyosti.malkki@gmail.com)
gerrit at coreboot.org
Sat Jan 11 20:56:29 CET 2014
Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4664
-gerrit
commit 78e13487a7fd6ccdc7ee3b736410bc9167bf77bd
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date: Sun Oct 13 20:41:57 2013 +0300
roda/rk9: Add EARLY_CBMEM_INIT
Change-Id: I450f78cce7172fd2dee66dc81b4f33e07c1aff09
Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
src/mainboard/roda/rk9/Kconfig | 2 +-
src/mainboard/roda/rk9/romstage.c | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/mainboard/roda/rk9/Kconfig b/src/mainboard/roda/rk9/Kconfig
index 59ae455..83cc450 100644
--- a/src/mainboard/roda/rk9/Kconfig
+++ b/src/mainboard/roda/rk9/Kconfig
@@ -13,8 +13,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_MP_TABLE
select CARDBUS_PLUGIN_SUPPORT
select HAVE_ACPI_TABLES
- #select HAVE_ACPI_RESUME
select EC_ACPI
+ select EARLY_CBMEM_INIT
select HAVE_OPTION_TABLE
config MAINBOARD_DIR
diff --git a/src/mainboard/roda/rk9/romstage.c b/src/mainboard/roda/rk9/romstage.c
index 075790d..e71e9c4 100644
--- a/src/mainboard/roda/rk9/romstage.c
+++ b/src/mainboard/roda/rk9/romstage.c
@@ -123,6 +123,7 @@ void main(unsigned long bist)
{
sysinfo_t sysinfo;
int s3resume = 0;
+ int cbmem_initted;
u16 reg16;
/* basic northbridge setup, including MMCONF BAR */
@@ -183,11 +184,12 @@ void main(unsigned long bist)
init_iommu();
+ cbmem_initted = !cbmem_initialize();
#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.
*/
- if (s3resume && cbmem_reinit() {
+ if (s3resume && cbmem_initted) {
void *resume_backup_memory = cbmem_find(CBMEM_ID_RESUME);
/* copy 1MB - 64K to high tables ram_base to prevent memory corruption
More information about the coreboot-gerrit
mailing list