diff --git a/src/drivers/intel/fsp2_0/memory_init.c b/src/drivers/intel/fsp2_0/memory_init.c
index 45516aa731..5363fdd380 100644
--- a/src/drivers/intel/fsp2_0/memory_init.c
+++ b/src/drivers/intel/fsp2_0/memory_init.c
@@ -13,6 +13,7 @@
 
 #include <arch/io.h>
 #include <arch/cpu.h>
+#include <cbmem.h>
 #include <console/console.h>
 #include <fsp/api.h>
 #include <fsp/util.h>
@@ -42,6 +43,9 @@ static enum fsp_status do_fsp_memory_init(void **hob_list_ptr,
 	/* Copy the default values from the UPD area */
 	memcpy(&fspm_upd, upd, sizeof(fspm_upd));
 
+	/* Reserve enough memory under TOLUD to save CBMEM header */
+	fspm_upd.FspmArchUpd.BootLoaderTolumSize = cbmem_overhead_size();
+
 	/* Give SoC and mainboard a chance to update the UPD */
 	platform_fsp_memory_init_params_cb(&fspm_upd);
 
diff --git a/src/soc/intel/apollolake/romstage.c b/src/soc/intel/apollolake/romstage.c
index 1a860e8eb2..ddbfaa4b39 100644
--- a/src/soc/intel/apollolake/romstage.c
+++ b/src/soc/intel/apollolake/romstage.c
@@ -213,8 +213,6 @@ void platform_fsp_memory_init_params_cb(struct FSPM_UPD *mupd)
 
 	/* Do NOT let FSP do any GPIO pad configuration */
 	mupd->FspmConfig.PreMemGpioTablePtr = (uintptr_t) NULL;
-	/* Reserve enough memory under TOLUD to save CBMEM header */
-	mupd->FspmArchUpd.BootLoaderTolumSize = cbmem_overhead_size();
 	/*
 	 * FSPM_UPD passed here is populated with default values provided by
 	 * the blob itself. We let FSPM use top of CAR region of the size it