diff options
| author | Duncan Laurie <dlaurie@chromium.org> | 2015-08-17 18:09:14 -0700 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-08-29 07:11:34 +0000 |
| commit | 9dcd4f059b5ba5229c90385e3d384ec04cc734f5 (patch) | |
| tree | bea527432b1e270c72d7cd5c85b39d684a3a8386 /src/soc/intel/common | |
| parent | fd016a44bb5221c0b47dc9e1b922a5290c16526c (diff) | |
fsp raminit: Add romstage_params to soc_memory_init_params
The SOC handler for memory init params is only taking UPD
as an input which does not allow it to use romstage_params.
In addition the UPD input is called params which is confusing
so rename it to upd so romstage_params can be passed properly.
BUG=chrome-os-partner:40635
BRANCH=none
TEST=build and boot on glados p2
Change-Id: I414610fee2b5d03a8e2cebfa548ea8bf49932a48
Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>
Original-Commit-Id: db94d6f3e6cad721de2188a136df10ccf66aff6a
Original-Change-Id: I7ec15edd4a16df121c5967aadd8b2651267ec773
Original-Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/294066
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/11413
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/soc/intel/common')
| -rw-r--r-- | src/soc/intel/common/raminit.c | 6 | ||||
| -rw-r--r-- | src/soc/intel/common/romstage.h | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/soc/intel/common/raminit.c b/src/soc/intel/common/raminit.c index 69ae1146a4..ddf567591d 100644 --- a/src/soc/intel/common/raminit.c +++ b/src/soc/intel/common/raminit.c @@ -100,7 +100,7 @@ void raminit(struct romstage_params *params) fsp_memory_init_params.HobListPtr = &hob_list_ptr; /* Update the UPD data */ - soc_memory_init_params(&memory_init_params); + soc_memory_init_params(params, &memory_init_params); mainboard_memory_init_params(params, &memory_init_params); post_code(0x36); @@ -309,7 +309,9 @@ __attribute__((weak)) void soc_display_memory_init_params( } /* Initialize the UPD parameters for MemoryInit */ -__attribute__((weak)) void soc_memory_init_params(MEMORY_INIT_UPD *params) +__attribute__((weak)) void soc_memory_init_params( + struct romstage_params *params, + MEMORY_INIT_UPD *upd) { printk(BIOS_DEBUG, "WEAK: %s/%s called\n", __FILE__, __func__); } diff --git a/src/soc/intel/common/romstage.h b/src/soc/intel/common/romstage.h index 403016e3b5..440cad75f5 100644 --- a/src/soc/intel/common/romstage.h +++ b/src/soc/intel/common/romstage.h @@ -93,7 +93,8 @@ void soc_after_ram_init(struct romstage_params *params); void soc_after_temp_ram_exit(void); void soc_display_memory_init_params(const MEMORY_INIT_UPD *old, MEMORY_INIT_UPD *new); -void soc_memory_init_params(MEMORY_INIT_UPD *params); +void soc_memory_init_params(struct romstage_params *params, + MEMORY_INIT_UPD *upd); void soc_pre_console_init(struct romstage_params *params); void soc_pre_ram_init(struct romstage_params *params); void soc_romstage_init(struct romstage_params *params); |