From 0a11a61395a71219c569367ff4a66a1d3605e60d Mon Sep 17 00:00:00 2001
From: Kyösti Mälkki <kyosti.malkki@gmail.com>
Date: Wed, 31 Dec 2014 19:29:02 +0200
Subject: CBMEM: Move cbmemc_reinit()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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)
---
 src/arch/x86/boot/cbmem.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/arch')

diff --git a/src/arch/x86/boot/cbmem.c b/src/arch/x86/boot/cbmem.c
index bbf70a2a0f..b53745bea5 100644
--- a/src/arch/x86/boot/cbmem.c
+++ b/src/arch/x86/boot/cbmem.c
@@ -22,6 +22,7 @@
 
 /* FIXME: Remove after CBMEM_INIT_HOOKS. */
 #include <cpu/x86/gdt.h>
+#include <console/cbmem_console.h>
 
 #if !CONFIG_DYNAMIC_CBMEM
 void get_cbmem_table(uint64_t *base, uint64_t *size)
@@ -75,6 +76,9 @@ void *cbmem_top(void)
 void cbmem_run_init_hooks(void)
 {
 #if !defined(__PRE_RAM__)
+	/* Relocate CBMEM console. */
+	cbmemc_reinit();
+
 	move_gdt();
 #endif
 }
-- 
cgit v1.2.3