13 files changed, 13 insertions, 13 deletions
diff --git a/src/mainboard/google/auron/Kconfig b/src/mainboard/google/auron/Kconfig
index 08d6ec6b7b..8e492556a7 100644
--- a/src/mainboard/google/auron/Kconfig
+++ b/src/mainboard/google/auron/Kconfig
@@ -15,7 +15,7 @@ config BOARD_GOOGLE_BASEBOARD_AURON
 	select MAINBOARD_HAS_TPM1
 	select INTEL_INT15
 	select SYSTEM_TYPE_LAPTOP if !BOARD_GOOGLE_BUDDY
-	select GENERIC_SPD_BIN if !BOARD_GOOGLE_BUDDY
+	select HAVE_SPD_IN_CBFS if !BOARD_GOOGLE_BUDDY
 
 if BOARD_GOOGLE_BASEBOARD_AURON
 
diff --git a/src/mainboard/google/cyan/Kconfig b/src/mainboard/google/cyan/Kconfig
index a43e473f53..1e8f8c23ff 100644
--- a/src/mainboard/google/cyan/Kconfig
+++ b/src/mainboard/google/cyan/Kconfig
@@ -17,7 +17,7 @@ config BOARD_GOOGLE_BASEBOARD_CYAN
 	select PCIEXP_L1_SUB_STATE if !BOARD_GOOGLE_CYAN
 	select SYSTEM_TYPE_LAPTOP
 	select USE_GOOGLE_FSP
-	select GENERIC_SPD_BIN
+	select HAVE_SPD_IN_CBFS
 
 if BOARD_GOOGLE_BASEBOARD_CYAN
 
diff --git a/src/mainboard/google/dedede/Kconfig b/src/mainboard/google/dedede/Kconfig
index 79c299587f..bd7d36e0fc 100644
--- a/src/mainboard/google/dedede/Kconfig
+++ b/src/mainboard/google/dedede/Kconfig
@@ -23,7 +23,7 @@ config BOARD_GOOGLE_BASEBOARD_DEDEDE
 	select SOC_INTEL_JASPERLAKE
 	select SOC_INTEL_COMMON_BLOCK_DTT
 	select SOC_INTEL_CSE_LITE_SKU
-	select GENERIC_SPD_BIN if !BOARD_GOOGLE_DEDEDE
+	select HAVE_SPD_IN_CBFS if !BOARD_GOOGLE_DEDEDE
 	select DRIVERS_INTEL_MIPI_CAMERA
 	select SOC_INTEL_COMMON_BLOCK_IPU
 
diff --git a/src/mainboard/google/drallion/Kconfig b/src/mainboard/google/drallion/Kconfig
index 3ec7a4f68f..d535d141e1 100644
--- a/src/mainboard/google/drallion/Kconfig
+++ b/src/mainboard/google/drallion/Kconfig
@@ -22,7 +22,7 @@ config BOARD_GOOGLE_BASEBOARD_DRALLION
 	select SYSTEM_TYPE_LAPTOP
 	select TPM2
 	select MAINBOARD_USES_IFD_EC_REGION
-	select GENERIC_SPD_BIN
+	select HAVE_SPD_IN_CBFS
 
 if BOARD_GOOGLE_BASEBOARD_DRALLION
 
diff --git a/src/mainboard/google/eve/Kconfig b/src/mainboard/google/eve/Kconfig
index c2fd9823f6..f7e82959ce 100644
--- a/src/mainboard/google/eve/Kconfig
+++ b/src/mainboard/google/eve/Kconfig
@@ -22,7 +22,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select MAINBOARD_HAS_TPM2
 	select SOC_INTEL_KABYLAKE
 	select SYSTEM_TYPE_CONVERTIBLE
-	select GENERIC_SPD_BIN
+	select HAVE_SPD_IN_CBFS
 
 config VBOOT
 	select EC_GOOGLE_CHROMEEC_SWITCHES
diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig
index af899cfbbc..50e56ce9e7 100644
--- a/src/mainboard/google/glados/Kconfig
+++ b/src/mainboard/google/glados/Kconfig
@@ -21,7 +21,7 @@ config BOARD_GOOGLE_BASEBOARD_GLADOS
 	select SYSTEM_TYPE_LAPTOP
 	select MAINBOARD_HAS_LIBGFXINIT
 	select MAINBOARD_NO_FSP_GOP if !BOARD_GOOGLE_GLADOS
-	select GENERIC_SPD_BIN
+	select HAVE_SPD_IN_CBFS
 
 if BOARD_GOOGLE_BASEBOARD_GLADOS
 
diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig
index ca310ed9b4..ecf156f266 100644
--- a/src/mainboard/google/hatch/Kconfig
+++ b/src/mainboard/google/hatch/Kconfig
@@ -81,7 +81,7 @@ config DIMM_SPD_SIZE
 config ROMSTAGE_SPD_CBFS
 	bool
 	default y if !ROMSTAGE_SPD_SMBUS
-	select GENERIC_SPD_BIN
+	select HAVE_SPD_IN_CBFS
 
 config ROMSTAGE_SPD_SMBUS
 	bool
diff --git a/src/mainboard/google/kahlee/Kconfig b/src/mainboard/google/kahlee/Kconfig
index a9ba0f5717..8e2639c2a4 100644
--- a/src/mainboard/google/kahlee/Kconfig
+++ b/src/mainboard/google/kahlee/Kconfig
@@ -14,7 +14,7 @@ config BOARD_GOOGLE_BASEBOARD_KAHLEE
 	select EC_GOOGLE_CHROMEEC_BOARDID
 	select EC_GOOGLE_CHROMEEC_LPC
 	select HAVE_ACPI_TABLES
-	select GENERIC_SPD_BIN
+	select HAVE_SPD_IN_CBFS
 	select GFXUMA
 	select GOOGLE_SMBIOS_MAINBOARD_VERSION
 	select MAINBOARD_HAS_CHROMEOS
diff --git a/src/mainboard/google/link/Kconfig b/src/mainboard/google/link/Kconfig
index 2c3076dadc..427e99de9c 100644
--- a/src/mainboard/google/link/Kconfig
+++ b/src/mainboard/google/link/Kconfig
@@ -8,7 +8,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select BOARD_ROMSIZE_KB_8192
 	select EC_GOOGLE_CHROMEEC
 	select EC_GOOGLE_CHROMEEC_LPC
-	select GENERIC_SPD_BIN
+	select HAVE_SPD_IN_CBFS
 	select HAVE_ACPI_TABLES
 	select HAVE_OPTION_TABLE
 	select HAVE_ACPI_RESUME
diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig
index ccd03cc844..bda2ca0a18 100644
--- a/src/mainboard/google/poppy/Kconfig
+++ b/src/mainboard/google/poppy/Kconfig
@@ -15,7 +15,7 @@ config BOARD_GOOGLE_BASEBOARD_POPPY
 	select MAINBOARD_HAS_CHROMEOS
 	select SOC_INTEL_KABYLAKE
 	select MAINBOARD_HAS_TPM2
-	select GENERIC_SPD_BIN
+	select HAVE_SPD_IN_CBFS
 
 if BOARD_GOOGLE_BASEBOARD_POPPY
 
diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig
index 22979e377b..4748d45d83 100644
--- a/src/mainboard/google/rambi/Kconfig
+++ b/src/mainboard/google/rambi/Kconfig
@@ -14,7 +14,7 @@ config BOARD_GOOGLE_BASEBOARD_RAMBI
 	select MAINBOARD_HAS_LPC_TPM
 	select MAINBOARD_HAS_TPM1
 	select SYSTEM_TYPE_LAPTOP if !BOARD_GOOGLE_NINJA && !BOARD_GOOGLE_SUMO
-	select GENERIC_SPD_BIN
+	select HAVE_SPD_IN_CBFS
 
 if BOARD_GOOGLE_BASEBOARD_RAMBI
 
diff --git a/src/mainboard/google/slippy/Kconfig b/src/mainboard/google/slippy/Kconfig
index 5a16d23ca8..c9ca334a8d 100644
--- a/src/mainboard/google/slippy/Kconfig
+++ b/src/mainboard/google/slippy/Kconfig
@@ -17,7 +17,7 @@ config BOARD_GOOGLE_BASEBOARD_SLIPPY
 	select MAINBOARD_HAS_LIBGFXINIT
 	select INTEL_GMA_HAVE_VBT
 	select DRIVERS_I2C_RTD2132 if BOARD_GOOGLE_LEON
-	select GENERIC_SPD_BIN
+	select HAVE_SPD_IN_CBFS
 
 if BOARD_GOOGLE_BASEBOARD_SLIPPY
 
diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig
index d2880bf680..427603c461 100644
--- a/src/mainboard/google/volteer/Kconfig
+++ b/src/mainboard/google/volteer/Kconfig
@@ -27,7 +27,7 @@ config BOARD_GOOGLE_BASEBOARD_VOLTEER
 	select MAINBOARD_HAS_TPM2
 	select PCIEXP_HOTPLUG
 	select SOC_INTEL_TIGERLAKE
-	select GENERIC_SPD_BIN
+	select HAVE_SPD_IN_CBFS
 
 if BOARD_GOOGLE_BASEBOARD_VOLTEER