summaryrefslogtreecommitdiff
path: root/src/mainboard/roda
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2013-10-13 20:41:57 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2014-01-22 20:53:20 +0100
commit886a543d60c528fd349b0b0aebf7338ec8350a88 (patch)
tree28e3022184b814a8105003e8003e5f00740a7aac /src/mainboard/roda
parenta7c9611712efc04c0c73a8a8621eabd5c869af89 (diff)
downloadcoreboot-886a543d60c528fd349b0b0aebf7338ec8350a88.tar.xz
roda/rk9: Add EARLY_CBMEM_INIT
Change-Id: I450f78cce7172fd2dee66dc81b4f33e07c1aff09 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/4664 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <patrick@georgi-clan.de> Reviewed-by: Aaron Durbin <adurbin@google.com>
Diffstat (limited to 'src/mainboard/roda')
-rw-r--r--src/mainboard/roda/rk9/Kconfig2
-rw-r--r--src/mainboard/roda/rk9/romstage.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/mainboard/roda/rk9/Kconfig b/src/mainboard/roda/rk9/Kconfig
index 59ae45553d..83cc450644 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 075790dfe5..e71e9c4851 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