summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2014-12-19 10:17:46 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2015-01-27 22:43:24 +0100
commit4d10750d1341f9831547e69d66b57ad512cfd6fb (patch)
tree36a0b29d7e1ce41dfbec1f74acfa26c5cc2d8cb3
parent0a11a61395a71219c569367ff4a66a1d3605e60d (diff)
downloadcoreboot-4d10750d1341f9831547e69d66b57ad512cfd6fb.tar.xz
CBMEM: Add timestamp_reinit()
This avoids the need for separate timestamp_reinit() calls made via CAR_MIGRATE() that is not implemented for ARM. Change-Id: Ia683162f3cb5d3cb3d4b7983a4b7e13306b0cfc8 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/8033 Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@google.com> Tested-by: build bot (Jenkins)
-rw-r--r--src/arch/x86/boot/cbmem.c4
-rw-r--r--src/lib/cbmem_common.c4
-rw-r--r--src/lib/hardwaremain.c2
3 files changed, 8 insertions, 2 deletions
diff --git a/src/arch/x86/boot/cbmem.c b/src/arch/x86/boot/cbmem.c
index b53745bea5..34309c2976 100644
--- a/src/arch/x86/boot/cbmem.c
+++ b/src/arch/x86/boot/cbmem.c
@@ -23,6 +23,7 @@
/* FIXME: Remove after CBMEM_INIT_HOOKS. */
#include <cpu/x86/gdt.h>
#include <console/cbmem_console.h>
+#include <timestamp.h>
#if !CONFIG_DYNAMIC_CBMEM
void get_cbmem_table(uint64_t *base, uint64_t *size)
@@ -79,6 +80,9 @@ void cbmem_run_init_hooks(void)
/* Relocate CBMEM console. */
cbmemc_reinit();
+ /* Relocate timestamps stash. */
+ timestamp_reinit();
+
move_gdt();
#endif
}
diff --git a/src/lib/cbmem_common.c b/src/lib/cbmem_common.c
index 1630628969..33f16b5872 100644
--- a/src/lib/cbmem_common.c
+++ b/src/lib/cbmem_common.c
@@ -22,6 +22,7 @@
/* FIXME: Remove after CBMEM_INIT_HOOKS. */
#include <console/cbmem_console.h>
+#include <timestamp.h>
#ifndef __PRE_RAM__
@@ -57,6 +58,9 @@ void cbmem_run_init_hooks(void)
{
/* Relocate CBMEM console. */
cbmemc_reinit();
+
+ /* Relocate timestamps stash. */
+ timestamp_reinit();
}
void __attribute__((weak)) cbmem_fail_resume(void)
diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c
index e01247b58d..d43ff4684c 100644
--- a/src/lib/hardwaremain.c
+++ b/src/lib/hardwaremain.c
@@ -181,8 +181,6 @@ static boot_state_t bs_post_device(void *arg)
dev_finalize();
timestamp_add_now(TS_DEVICE_DONE);
- timestamp_reinit();
-
return BS_OS_RESUME_CHECK;
}