7 files changed, 9 insertions, 9 deletions
diff --git a/src/mainboard/intel/cannonlake_rvp/Kconfig b/src/mainboard/intel/cannonlake_rvp/Kconfig
index 32c9487052..c0647e11bd 100644
--- a/src/mainboard/intel/cannonlake_rvp/Kconfig
+++ b/src/mainboard/intel/cannonlake_rvp/Kconfig
@@ -3,11 +3,11 @@ if BOARD_INTEL_CANNONLAKE_RVPU || BOARD_INTEL_CANNONLAKE_RVPY
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_16384
-	select GENERIC_SPD_BIN
+	select HAVE_SPD_IN_CBFS
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
 	select MAINBOARD_HAS_CHROMEOS
-	select GENERIC_SPD_BIN
+	select HAVE_SPD_IN_CBFS
 	select DRIVERS_I2C_HID
 	select DRIVERS_I2C_GENERIC
 	select DRIVERS_I2C_DA7219
diff --git a/src/mainboard/intel/harcuvar/Kconfig b/src/mainboard/intel/harcuvar/Kconfig
index dde087ae08..05a8d2d405 100644
--- a/src/mainboard/intel/harcuvar/Kconfig
+++ b/src/mainboard/intel/harcuvar/Kconfig
@@ -19,7 +19,7 @@ config MAINBOARD_PART_NUMBER
 config ENABLE_FSP_MEMORY_DOWN
 	bool "Enable Memory Down"
 	default n
-	select GENERIC_SPD_BIN
+	select HAVE_SPD_IN_CBFS
 	help
 	  Select this option to enable Memory Down function.
 
diff --git a/src/mainboard/intel/icelake_rvp/Kconfig b/src/mainboard/intel/icelake_rvp/Kconfig
index 2743384967..69559edcea 100644
--- a/src/mainboard/intel/icelake_rvp/Kconfig
+++ b/src/mainboard/intel/icelake_rvp/Kconfig
@@ -4,11 +4,11 @@ config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_16384
 	select EC_ACPI
-	select GENERIC_SPD_BIN
+	select HAVE_SPD_IN_CBFS
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
 	select MAINBOARD_HAS_CHROMEOS
-	select GENERIC_SPD_BIN
+	select HAVE_SPD_IN_CBFS
 	select DRIVERS_I2C_HID
 	select DRIVERS_I2C_GENERIC
 	select DRIVERS_SPI_ACPI
diff --git a/src/mainboard/intel/jasperlake_rvp/Kconfig b/src/mainboard/intel/jasperlake_rvp/Kconfig
index 91ce0a84a1..1125a9b7f2 100644
--- a/src/mainboard/intel/jasperlake_rvp/Kconfig
+++ b/src/mainboard/intel/jasperlake_rvp/Kconfig
@@ -13,7 +13,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select DRIVERS_SPI_ACPI
 	select DRIVERS_USB_ACPI
 	select EC_ACPI
-	select GENERIC_SPD_BIN
+	select HAVE_SPD_IN_CBFS
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
 	select MAINBOARD_HAS_CHROMEOS
diff --git a/src/mainboard/intel/kblrvp/Kconfig b/src/mainboard/intel/kblrvp/Kconfig
index d7209c58da..f1db3dac3f 100644
--- a/src/mainboard/intel/kblrvp/Kconfig
+++ b/src/mainboard/intel/kblrvp/Kconfig
@@ -12,7 +12,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select SOC_INTEL_KABYLAKE
 	select SKYLAKE_SOC_PCH_H if BOARD_INTEL_KBLRVP8 || BOARD_INTEL_KBLRVP11
 	select MAINBOARD_HAS_CHROMEOS
-	select GENERIC_SPD_BIN
+	select HAVE_SPD_IN_CBFS
 	select MAINBOARD_HAS_LPC_TPM
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select MAINBOARD_USES_IFD_GBE_REGION if BOARD_INTEL_KBLRVP8
diff --git a/src/mainboard/intel/kunimitsu/Kconfig b/src/mainboard/intel/kunimitsu/Kconfig
index c655a88705..6e745d947a 100644
--- a/src/mainboard/intel/kunimitsu/Kconfig
+++ b/src/mainboard/intel/kunimitsu/Kconfig
@@ -19,7 +19,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select MAINBOARD_HAS_CHROMEOS
 	select MAINBOARD_HAS_LPC_TPM
 	select SOC_INTEL_SKYLAKE
-	select GENERIC_SPD_BIN
+	select HAVE_SPD_IN_CBFS
 
 config VBOOT
 	select EC_GOOGLE_CHROMEEC_SWITCHES
diff --git a/src/mainboard/intel/tglrvp/Kconfig b/src/mainboard/intel/tglrvp/Kconfig
index 9268e2fb7f..ddb8939868 100644
--- a/src/mainboard/intel/tglrvp/Kconfig
+++ b/src/mainboard/intel/tglrvp/Kconfig
@@ -17,7 +17,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select DRIVERS_INTEL_ISH
 	select EC_ACPI
 	select PCIEXP_HOTPLUG
-	select GENERIC_SPD_BIN
+	select HAVE_SPD_IN_CBFS
 	select SOC_INTEL_CSE_LITE_SKU
 
 config CHROMEOS