From 2a983bd50d072815fc5bdcbb9c55f967b5a6f554 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Sat, 11 Jul 2015 13:36:01 -0500 Subject: timestamps: clarify in ramstage when not to reinit the cache Commit bd1499d3 fixed a bug to not re-initialize the timestamp cache in ramstage for EARLY_CBMEM_INIT. However, EARLY_CBMEM_INIT was not included. Therefore, add this condition. This will result in base_time being initialized to the passed in timestamp for !EARLY_CBMEM_INIT platforms. Change-Id: Ia1d744b3cfd28163f3339f2364efe59f7dcb719b Signed-off-by: Aaron Durbin Reviewed-on: http://review.coreboot.org/10884 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/lib/timestamp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/lib') diff --git a/src/lib/timestamp.c b/src/lib/timestamp.c index 7ead3831bb..ca25093423 100644 --- a/src/lib/timestamp.c +++ b/src/lib/timestamp.c @@ -202,7 +202,7 @@ void timestamp_init(uint64_t base) /* In the EARLY_CBMEM_INIT case timestamps could have already been * recovered. In those circumstances honor the cache which sits in BSS * as it has already been initialized. */ - if (ENV_RAMSTAGE && + if (ENV_RAMSTAGE && IS_ENABLED(CONFIG_EARLY_CBMEM_INIT) && ts_cache->cache_state != TIMESTAMP_CACHE_UNINITIALIZED) return; -- cgit v1.2.3