diff options
author | Matt DeVillier <matt.devillier@gmail.com> | 2017-10-03 15:39:22 -0500 |
---|---|---|
committer | Martin Roth <martinroth@google.com> | 2017-10-08 22:34:47 +0000 |
commit | f2fc4972282bfa92be417bc6f3df3197c47ceb01 (patch) | |
tree | 76aa4d6eb924d19f7f10e14c303fc4b9b1f4eb25 /src/mainboard/google/cyan/variants/terra | |
parent | 43ae4336b232100aa567cb7bd8a66de5f981fe3f (diff) |
google/cyan: fix variant memory/silicon init params override
The mainboard_memory_init_params() and mainboard_silicon_init_params()
methods already have weak definitions in drivers/intel/fsp1_1,
so having them declared as weak in the cyan baseboard has the effect
of them not being called at all unless overridden at the variant level.
Therefore, remove the weak declarations in the baseboard and ensure
that each variant has its own init functions if needed.
TEST: build/boot google/cyan
Change-Id: I1c76cb5838ef1e65e72c7341d951f9baf2ddd41b
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/21704
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Diffstat (limited to 'src/mainboard/google/cyan/variants/terra')
-rw-r--r-- | src/mainboard/google/cyan/variants/terra/ramstage.c | 2 | ||||
-rw-r--r-- | src/mainboard/google/cyan/variants/terra/romstage.c | 11 |
2 files changed, 3 insertions, 10 deletions
diff --git a/src/mainboard/google/cyan/variants/terra/ramstage.c b/src/mainboard/google/cyan/variants/terra/ramstage.c index 6ef4360377..51857f9819 100644 --- a/src/mainboard/google/cyan/variants/terra/ramstage.c +++ b/src/mainboard/google/cyan/variants/terra/ramstage.c @@ -17,7 +17,7 @@ #include <boardid.h> #include <variant/onboard.h> -void mainboard_silicon_init_params(SILICON_INIT_UPD *params) +void board_silicon_USB2_override(SILICON_INIT_UPD *params) { uint8_t boardid = 0; uint8_t projectid = 0; diff --git a/src/mainboard/google/cyan/variants/terra/romstage.c b/src/mainboard/google/cyan/variants/terra/romstage.c index e670461ff8..8b30d69c92 100644 --- a/src/mainboard/google/cyan/variants/terra/romstage.c +++ b/src/mainboard/google/cyan/variants/terra/romstage.c @@ -15,11 +15,10 @@ */ #include <soc/romstage.h> -#include <chip.h> +#include <baseboard/variants.h> #include <mainboard/google/cyan/spd/spd_util.h> -void mainboard_memory_init_params(struct romstage_params *params, - MEMORY_INIT_UPD *memory_params) +void variant_memory_init_params(MEMORY_INIT_UPD *memory_params) { int ram_id = get_ramid(); @@ -45,10 +44,4 @@ void mainboard_memory_init_params(struct romstage_params *params, memory_params->PcdDramDensity = 3; memory_params->PcdDualRankDram = 0; } - - /* Update SPD data */ - memory_params->PcdMemoryTypeEnable = MEM_LPDDR3; - memory_params->PcdMemorySpdPtr = (u32)params->pei_data->spd_data_ch0; - memory_params->PcdMemChannel0Config = params->pei_data->spd_ch0_config; - memory_params->PcdMemChannel1Config = params->pei_data->spd_ch1_config; } |