Alexandru Gagniuc (alexandrux.gagniuc@intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14574
-gerrit
commit 478fa3850956111f68bbad48c74984be0f8a8315 Author: Alexandru Gagniuc alexandrux.gagniuc@intel.com Date: Mon May 2 13:40:15 2016 -0700
soc/apollolake/romstage: Do not cast const to non-const pointers
That was a workaround for the MRC cache API, which has since been reworked. The workaround is no longer needed.
Change-Id: I1c1883f3ea37245615248459cd993ed774bf92de Signed-off-by: Alexandru Gagniuc alexandrux.gagniuc@intel.com --- src/soc/intel/apollolake/romstage.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/soc/intel/apollolake/romstage.c b/src/soc/intel/apollolake/romstage.c index 9dcb26a..42af6c0 100644 --- a/src/soc/intel/apollolake/romstage.c +++ b/src/soc/intel/apollolake/romstage.c @@ -79,7 +79,8 @@ static void disable_watchdog(void)
asmlinkage void car_stage_entry(void) { - void *hob_list_ptr, *mrc_data; + void *hob_list_ptr; + const void *mrc_data; struct range_entry fsp_mem, reg_car; struct postcar_frame pcf; size_t mrc_data_size; @@ -116,8 +117,7 @@ asmlinkage void car_stage_entry(void) /* Save MRC Data to CBMEM */ if (IS_ENABLED(CONFIG_CACHE_MRC_SETTINGS)) { - /* TODO: treat MRC data as const */ - mrc_data = (void*) fsp_find_nv_storage_data(&mrc_data_size); + mrc_data = fsp_find_nv_storage_data(&mrc_data_size); if (mrc_data && mrc_cache_stash_data(mrc_data, mrc_data_size) < 0) printk(BIOS_ERR, "Failed to stash MRC data\n"); }