[coreboot-gerrit] New patch to review for coreboot: f18612f google/stout: Add EARLY_CBMEM_INIT

[Kyösti Mälkki]

Kyösti Mälkki ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4665

-gerrit

commit f18612fef48b1e872520194f76d716f54e375a6a
Author: Kyösti Mälkki 
Date:   Tue Oct 15 20:16:26 2013 +0300

google/stout: Add EARLY_CBMEM_INIT

Required for MRC cache and for HAVE_ACPI_RESUME to work.

Change-Id: I7d48b167bd581d7c14ca50bd46e74be0133cecfb
    Signed-off-by: Kyösti Mälkki 
---
 src/mainboard/google/stout/Kconfig    | 1 +
 src/mainboard/google/stout/romstage.c | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/mainboard/google/stout/Kconfig b/src/mainboard/google/stout/Kconfig
index 7ee8fd4..fb81754 100644
--- a/src/mainboard/google/stout/Kconfig
+++ b/src/mainboard/google/stout/Kconfig
@@ -8,6 +8,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
    select SOUTHBRIDGE_INTEL_C216
    select EC_QUANTA_IT8518
    select BOARD_ROMSIZE_KB_8192
+	select EARLY_CBMEM_INIT
    select HAVE_ACPI_TABLES
    select HAVE_OPTION_TABLE
    select HAVE_ACPI_RESUME
diff --git a/src/mainboard/google/stout/romstage.c b/src/mainboard/google/stout/romstage.c
index 8a961ea..a0700af 100644
--- a/src/mainboard/google/stout/romstage.c
+++ b/src/mainboard/google/stout/romstage.c
@@ -296,11 +296,7 @@ void main(unsigned long bist)
    post_code(0x3e);

MCHBAR16(SSKPD) = 0xCAFE;
-#if CONFIG_EARLY_CBMEM_INIT
    cbmem_was_initted = !cbmem_initialize();
-#else
-	cbmem_was_initted = cbmem_reinit();
-#endif

#if CONFIG_HAVE_ACPI_RESUME
    /* If there is no high memory area, we didn't boot before, so