CBMEM: Move cbmemc_reinit()
This replaces need for separate cbmemc_reinit() calls made
via CAR_MIGRATE() and in ramstage.
Change-Id: If7b4d855c75df58b173f26ef3c90a4a7563166d3
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/7859
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@google.com>
Tested-by: build bot (Jenkins)
diff --git a/src/lib/cbmem_common.c b/src/lib/cbmem_common.c
index 438fd7f..1630628 100644
--- a/src/lib/cbmem_common.c
+++ b/src/lib/cbmem_common.c
@@ -20,6 +20,9 @@
#include <cbmem.h>
#include <stdlib.h>
+/* FIXME: Remove after CBMEM_INIT_HOOKS. */
+#include <console/cbmem_console.h>
+
#ifndef __PRE_RAM__
static const struct cbmem_id_to_name cbmem_ids[] = { CBMEM_ID_TO_NAME_TABLE };
@@ -52,6 +55,8 @@
#if !IS_ENABLED(CONFIG_ARCH_X86)
void cbmem_run_init_hooks(void)
{
+ /* Relocate CBMEM console. */
+ cbmemc_reinit();
}
void __attribute__((weak)) cbmem_fail_resume(void)