From f89cb241eecdf70d9e52c852833c6ed1e3b9632d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Niew=C3=B6hner?= Date: Wed, 9 Oct 2019 21:02:36 +0200 Subject: mb/google/glados: port to FSP 2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch is part of the patch series to drop support for FSP 1.1 in soc/intel/skylake. The following modifications have been done to migrate the board(s) from FSP 1.1 to FSP 2.0: - remove deprecated devicetree VR_RING domain (only 4 domains in FSP 2.0) - switch to using the FSP default VBT TODO: - testing Change-Id: Id747ef484dfdcb2d346f817976f52073912468d0 Signed-off-by: Michael Niewöhner Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/35921 Tested-by: build bot (Jenkins) --- src/mainboard/google/glados/spd/spd.c | 8 +++++--- src/mainboard/google/glados/spd/spd_util.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src/mainboard/google/glados/spd') diff --git a/src/mainboard/google/glados/spd/spd.c b/src/mainboard/google/glados/spd/spd.c index 9503582c9a..324d3be866 100644 --- a/src/mainboard/google/glados/spd/spd.c +++ b/src/mainboard/google/glados/spd/spd.c @@ -83,8 +83,10 @@ __weak int is_dual_channel(const int spd_index) } /* Copy SPD data for on-board memory */ -void spd_memory_init_params(MEMORY_INIT_UPD *const memory_params, int spd_index) +void spd_memory_init_params(FSPM_UPD *mupd, int spd_index) { + FSP_M_CONFIG *mem_cfg; + mem_cfg = &mupd->FspmConfig; uint8_t *spd_file; size_t spd_file_len; @@ -112,9 +114,9 @@ void spd_memory_init_params(MEMORY_INIT_UPD *const memory_params, int spd_index) die("Invalid SPD data."); /* Assume same memory in both channels */ - memory_params->MemorySpdPtr00 = (uintptr_t)spd_file + spd_offset; + mem_cfg->MemorySpdPtr00 = (uintptr_t)spd_file + spd_offset; if (is_dual_channel(spd_index)) - memory_params->MemorySpdPtr10 = memory_params->MemorySpdPtr00; + mem_cfg->MemorySpdPtr10 = mem_cfg->MemorySpdPtr00; mainboard_print_spd_info(spd_file + spd_offset); } diff --git a/src/mainboard/google/glados/spd/spd_util.h b/src/mainboard/google/glados/spd/spd_util.h index 90dbd5ff98..b1e9a7a8a2 100644 --- a/src/mainboard/google/glados/spd/spd_util.h +++ b/src/mainboard/google/glados/spd/spd_util.h @@ -16,6 +16,6 @@ #include -void spd_memory_init_params(MEMORY_INIT_UPD *, int spd_index); +void spd_memory_init_params(FSPM_UPD *mupd, int spd_index); #endif /* SPD_UTIL_H */ -- cgit v1.2.3