the following patch was just integrated into master: commit 2ad1dbaf2a2dfe373ff89927202acc01e36c7cd4 Author: Aaron Durbin adurbin@chromium.org Date: Thu Feb 7 00:51:18 2013 -0600
haswell: move call site of save_mrc_data()
The save_mrc_data() was previously called conditionally in the raminit code. The save_mrc_data() function was called in the non-S3 wake paths. However, the common romstage_common() code was checking cbmem initialization things on s3 wake. Between the two callers cbmem_initialize() was being called twice in the non-s3 wake paths. Moreover, saving of the mrc data was not allowed when CONFIG_EARLY_CBMEM_INIT wasn't enabled.
Therefore, move the save_mrc_data() to romstage_common. It already has the knowledge of the wake path. Also remove the CONFIG_EARLY_CBMEM_INIT requirement from save_mrc_data() as well as the call to cbmem_initialize().
Change-Id: I7f0e4d752c92d9d5eedb8fa56133ec190caf77da Signed-off-by: Aaron Durbin adurbin@chromium.org Reviewed-on: http://review.coreboot.org/2756 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich rminnich@gmail.com
Build-Tested: build bot (Jenkins) at Sat Mar 16 01:02:43 2013, giving +1 Reviewed-By: Ronald G. Minnich rminnich@gmail.com at Mon Mar 18 20:50:14 2013, giving +2 See http://review.coreboot.org/2756 for details.
-gerrit