From 886a543d60c528fd349b0b0aebf7338ec8350a88 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Sun, 13 Oct 2013 20:41:57 +0300 Subject: roda/rk9: Add EARLY_CBMEM_INIT MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I450f78cce7172fd2dee66dc81b4f33e07c1aff09 Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/4664 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi Reviewed-by: Aaron Durbin --- src/mainboard/roda/rk9/Kconfig | 2 +- src/mainboard/roda/rk9/romstage.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/mainboard/roda/rk9') 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 -- cgit v1.2.3