diff --git a/src/soc/intel/common/raminit.c b/src/soc/intel/common/raminit.c
index bdb23e2..932d5c3 100644
--- a/src/soc/intel/common/raminit.c
+++ b/src/soc/intel/common/raminit.c
@@ -57,6 +57,7 @@
 	unsigned long int data;
 	EFI_PEI_HOB_POINTERS hob_ptr;
 #endif
+	struct fsp_car_context *fsp_car_context;
 
 	/*
 	 * Find and copy the UPD region to the stack so the platform can modify
@@ -68,7 +69,8 @@
 	 * region in the FSP binary.
 	 */
 	post_code(0x34);
-	fsp_header = params->chipset_context;
+	fsp_car_context = params->chipset_context;
+	fsp_header = fsp_car_context->fih;
 	vpd_ptr = (VPD_DATA_REGION *)(fsp_header->CfgRegionOffset +
 					fsp_header->ImageBase);
 	printk(BIOS_DEBUG, "VPD Data: 0x%p\n", vpd_ptr);
@@ -167,7 +169,7 @@
 	}
 
 	/* Save the FSP runtime parameters. */
-	fsp_set_runtime(params->chipset_context, hob_list_ptr);
+	fsp_set_runtime(fsp_header, hob_list_ptr);
 
 	/* Lookup the FSP_BOOTLOADER_TOLUM_HOB */
 	cbmem_root = get_next_resource_hob(&bootldr_tolum_guid, hob_list_ptr);