From 4d10750d1341f9831547e69d66b57ad512cfd6fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Fri, 19 Dec 2014 10:17:46 +0200 Subject: CBMEM: Add timestamp_reinit() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: http://review.coreboot.org/8033 Reviewed-by: Stefan Reinauer Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- src/lib/cbmem_common.c | 4 ++++ src/lib/hardwaremain.c | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/lib') 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 +#include #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; } -- cgit v1.2.3