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)

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
 }

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)

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