From 2ad1dbaf2a2dfe373ff89927202acc01e36c7cd4 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Thu, 7 Feb 2013 00:51:18 -0600 Subject: 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 Reviewed-on: http://review.coreboot.org/2756 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich --- src/northbridge/intel/haswell/raminit.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/northbridge/intel/haswell/raminit.h') diff --git a/src/northbridge/intel/haswell/raminit.h b/src/northbridge/intel/haswell/raminit.h index f94dea8c3a..46be570a8a 100644 --- a/src/northbridge/intel/haswell/raminit.h +++ b/src/northbridge/intel/haswell/raminit.h @@ -25,5 +25,7 @@ void sdram_initialize(struct pei_data *pei_data); unsigned long get_top_of_ram(void); int fixup_haswell_errata(void); +/* save_mrc_data() must be called after cbmem has been initialized. */ +void save_mrc_data(struct pei_data *pei_data); #endif /* RAMINIT_H */ -- cgit v1.2.3