[coreboot-gerrit] Patch set updated for coreboot: timestamps: clarify in ramstage when not to reinit the cache

[Aaron Durbin (adurbin@chromium.org)]

Aaron Durbin (adurbin at chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10884

-gerrit

commit 7890eeaf3e1c1d9208ec62724442887840467311
Author: Aaron Durbin <adurbin at chromium.org>
Date:   Sat Jul 11 13:36:01 2015 -0500

    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 <adurbin at chromium.org>
---
 src/lib/timestamp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/timestamp.c b/src/lib/timestamp.c
index 7ead383..ca25093 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;