summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2014-12-31 19:29:02 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2015-01-27 22:42:23 +0100
commit0a11a61395a71219c569367ff4a66a1d3605e60d (patch)
tree880a55c68b5800e3c77a2cd76b1a24461b8d8b99 /src/arch
parente45542580c1765720dbfbd8b4076296e442a211b (diff)
downloadcoreboot-0a11a61395a71219c569367ff4a66a1d3605e60d.tar.xz
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)
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/x86/boot/cbmem.c4
1 files changed, 4 insertions, 0 deletions
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
}