mb/google/glados: port to FSP 2.0

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 <foss@mniewoehner.de>
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35921
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

1 files changed, 5 insertions, 3 deletions

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);
 }