3 files changed, 9 insertions, 9 deletions
diff --git a/src/mainboard/google/reef/romstage.c b/src/mainboard/google/reef/romstage.c
index d7ec5b263b..aa1b18d2b8 100644
--- a/src/mainboard/google/reef/romstage.c
+++ b/src/mainboard/google/reef/romstage.c
@@ -162,7 +162,7 @@ static int get_mem_sku(void)
 	return gpio_pullup_base2_value(pads, ARRAY_SIZE(pads));
 }
 
-void mainboard_memory_init_params(struct FSPM_UPD *memupd)
+void mainboard_memory_init_params(FSPM_UPD *memupd)
 {
 	int mem_sku = get_mem_sku();
 
diff --git a/src/mainboard/intel/amenia/romstage.c b/src/mainboard/intel/amenia/romstage.c
index d08b343823..582c7542f6 100644
--- a/src/mainboard/intel/amenia/romstage.c
+++ b/src/mainboard/intel/amenia/romstage.c
@@ -17,7 +17,7 @@
 
 #include <soc/romstage.h>
 #include <string.h>
-#include <soc/fsp/FspmUpd.h>
+#include <fsp/soc_binding.h>
 
 /* Channel 0 PHY to DUnit DQ mapping */
 static const uint8_t swizzling_ch0_amenia[] = {
@@ -43,7 +43,7 @@ static const uint8_t swizzling_ch3_amenia[] = {
 	17, 23, 19, 16, 21, 22, 20, 18, 31, 29, 26, 25, 28, 27, 24, 30,
 };
 
-static void amenia_fill_memory_params(struct FSP_M_CONFIG *cfg)
+static void amenia_fill_memory_params(FSP_M_CONFIG *cfg)
 {
 	cfg->Profile = 11;			/* 0xB:LPDDR4_2400_24_22_22 */
 	cfg->DIMM0SPDAddress = 0;
@@ -87,9 +87,9 @@ static void amenia_fill_memory_params(struct FSP_M_CONFIG *cfg)
 	       sizeof(swizzling_ch3_amenia));
 }
 
-void mainboard_memory_init_params(struct FSPM_UPD *memupd)
+void mainboard_memory_init_params(FSPM_UPD *memupd)
 {
-	struct FSP_M_CONFIG *cfg = &memupd->FspmConfig;
+	FSP_M_CONFIG *cfg = &memupd->FspmConfig;
 
 	cfg->Package = 1;			/* 0x1:BGA */
 	cfg->MemoryDown = 1;
diff --git a/src/mainboard/intel/apollolake_rvp/romstage.c b/src/mainboard/intel/apollolake_rvp/romstage.c
index 0711501ee4..631adea496 100644
--- a/src/mainboard/intel/apollolake_rvp/romstage.c
+++ b/src/mainboard/intel/apollolake_rvp/romstage.c
@@ -18,7 +18,7 @@
 #include <soc/romstage.h>
 #include <string.h>
 #include <fsp/api.h>
-#include <soc/fsp/FspmUpd.h>
+#include <fsp/soc_binding.h>
 
 static const uint8_t swizzling_rvp1[] = {
 	 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
@@ -45,7 +45,7 @@ static const uint8_t swizzling3_rvp2[] = {
 	15,  9, 11, 14, 12,  8, 13, 10, 26, 29, 24, 31, 25, 30, 27, 28,
 };
 
-static void rvp1_fill_memory_params(struct FSPM_UPD *mupd)
+static void rvp1_fill_memory_params(FSPM_UPD *mupd)
 {
 	mupd->FspmConfig.Profile = 33;
 	mupd->FspmConfig.DIMM0SPDAddress = 0xa0;
@@ -72,7 +72,7 @@ static void rvp1_fill_memory_params(struct FSPM_UPD *mupd)
 	memcpy(mupd->FspmConfig.Ch3_Bit_swizzling, swizzling_rvp1, sizeof(swizzling_rvp1));
 }
 
-static void rvp2_fill_memory_params(struct FSPM_UPD *mupd)
+static void rvp2_fill_memory_params(FSPM_UPD *mupd)
 {
 	mupd->FspmConfig.Profile = 5;
 	mupd->FspmConfig.DIMM0SPDAddress = 0;
@@ -103,7 +103,7 @@ static void rvp2_fill_memory_params(struct FSPM_UPD *mupd)
 	       sizeof(swizzling3_rvp2));
 }
 
-void mainboard_memory_init_params(struct FSPM_UPD *mupd)
+void mainboard_memory_init_params(FSPM_UPD *mupd)
 {
 	mupd->FspmConfig.Package = 0;
 	mupd->FspmConfig.MemoryDown = 1;