[coreboot-gerrit] Patch set updated for coreboot: f7a4f2d CBMEM: Add timestamp_reinit()

[Kyösti Mälkki (kyosti.malkki@gmail.com)]

Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8033

-gerrit

commit f7a4f2d14f041b56605399cbc5d05c75269c8013
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Fri Dec 19 10:17:46 2014 +0200

    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 at gmail.com>
---
 src/arch/x86/boot/cbmem.c | 4 ++++
 src/lib/cbmem_common.c    | 4 ++++
 src/lib/hardwaremain.c    | 2 --
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/arch/x86/boot/cbmem.c b/src/arch/x86/boot/cbmem.c
index b53745b..34309c2 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 0389c9d..129aa09 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__
 
@@ -56,6 +57,9 @@ void __attribute__((weak)) 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 e01247b..d43ff46 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;
 }