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;
 }