summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niewöhner <foss@mniewoehner.de>2020-09-07 14:26:09 +0200
committerMichael Niewöhner <foss@mniewoehner.de>2020-09-23 09:00:47 +0000
commit87cc889e8b144b36555eff502f69ef296b99da92 (patch)
tree7bf87c03fe67b248ac2fe4990ab155d097732d4d
parent83f0c699c773afe7a81831e1f980ded1e36fb821 (diff)
downloadcoreboot-87cc889e8b144b36555eff502f69ef296b99da92.tar.xz
treewide: rename GENERIC_SPD_BIN to HAVE_SPD_BIN_IN_CBFS
The name GENERIC_SPD_BIN doesn't reflect anymore what that config is used for, so rename it to HAVE_SPD_BIN_IN_CBFS. Change-Id: I4004c48da205949e05101039abd4cf32666787df Signed-off-by: Michael Niewöhner <foss@mniewoehner.de> Reviewed-on: https://review.coreboot.org/c/coreboot/+/45147 Reviewed-by: Felix Singer <felixsinger@posteo.net> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/lib/Kconfig2
-rw-r--r--src/lib/Makefile.inc4
-rw-r--r--src/mainboard/bap/ode_e20XX/Kconfig2
-rw-r--r--src/mainboard/facebook/fbg1701/Kconfig2
-rw-r--r--src/mainboard/gizmosphere/gizmo/Kconfig2
-rw-r--r--src/mainboard/gizmosphere/gizmo2/Kconfig2
-rw-r--r--src/mainboard/google/auron/Kconfig2
-rw-r--r--src/mainboard/google/cyan/Kconfig2
-rw-r--r--src/mainboard/google/dedede/Kconfig2
-rw-r--r--src/mainboard/google/drallion/Kconfig2
-rw-r--r--src/mainboard/google/eve/Kconfig2
-rw-r--r--src/mainboard/google/glados/Kconfig2
-rw-r--r--src/mainboard/google/hatch/Kconfig2
-rw-r--r--src/mainboard/google/kahlee/Kconfig2
-rw-r--r--src/mainboard/google/link/Kconfig2
-rw-r--r--src/mainboard/google/poppy/Kconfig2
-rw-r--r--src/mainboard/google/rambi/Kconfig2
-rw-r--r--src/mainboard/google/slippy/Kconfig2
-rw-r--r--src/mainboard/google/volteer/Kconfig2
-rw-r--r--src/mainboard/hp/snb_ivb_laptops/Kconfig.name2
-rw-r--r--src/mainboard/intel/cannonlake_rvp/Kconfig4
-rw-r--r--src/mainboard/intel/harcuvar/Kconfig2
-rw-r--r--src/mainboard/intel/icelake_rvp/Kconfig4
-rw-r--r--src/mainboard/intel/jasperlake_rvp/Kconfig2
-rw-r--r--src/mainboard/intel/kblrvp/Kconfig2
-rw-r--r--src/mainboard/intel/kunimitsu/Kconfig2
-rw-r--r--src/mainboard/intel/tglrvp/Kconfig2
-rw-r--r--src/mainboard/lenovo/s230u/Kconfig2
-rw-r--r--src/mainboard/lenovo/t430s/Kconfig2
-rw-r--r--src/mainboard/lenovo/x1_carbon_gen1/Kconfig2
-rw-r--r--src/mainboard/pcengines/apu1/Kconfig2
-rw-r--r--src/mainboard/pcengines/apu2/Kconfig2
-rw-r--r--src/mainboard/portwell/m107/Kconfig2
-rw-r--r--src/mainboard/razer/blade_stealth_kbl/Kconfig2
-rw-r--r--src/mainboard/samsung/lumpy/Kconfig2
-rw-r--r--src/mainboard/system76/lemp9/Kconfig2
36 files changed, 39 insertions, 39 deletions
diff --git a/src/lib/Kconfig b/src/lib/Kconfig
index d91ec5875e..d6e7e51d5c 100644
--- a/src/lib/Kconfig
+++ b/src/lib/Kconfig
@@ -30,7 +30,7 @@ config FLATTENED_DEVICE_TREE
Selected by features that require to parse and manipulate a flattened
devicetree in ramstage.
-config GENERIC_SPD_BIN
+config HAVE_SPD_IN_CBFS
bool
help
If enabled, add support for adding spd.hex files in cbfs as spd.bin
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index 96dd06e215..6829578800 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -350,7 +350,7 @@ endif # CONFIG_RAMSTAGE_LIBHWBASE
romstage-y += spd_bin.c
-ifeq ($(CONFIG_GENERIC_SPD_BIN),y)
+ifeq ($(CONFIG_HAVE_SPD_IN_CBFS),y)
LIB_SPD_BIN = $(obj)/spd.bin
LIB_SPD_DEPS = $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/spd/$(f).spd.hex)
@@ -363,7 +363,7 @@ $(LIB_SPD_BIN): $(LIB_SPD_DEPS)
done; \
done > $@
-cbfs-files-$(CONFIG_GENERIC_SPD_BIN) += spd.bin
+cbfs-files-$(CONFIG_HAVE_SPD_IN_CBFS) += spd.bin
spd.bin-file := $(LIB_SPD_BIN)
spd.bin-type := spd
endif
diff --git a/src/mainboard/bap/ode_e20XX/Kconfig b/src/mainboard/bap/ode_e20XX/Kconfig
index 9e673ff653..bea756a1b3 100644
--- a/src/mainboard/bap/ode_e20XX/Kconfig
+++ b/src/mainboard/bap/ode_e20XX/Kconfig
@@ -15,7 +15,7 @@ config BOARD_SPECIFIC_OPTIONS
select BOARD_ROMSIZE_KB_4096
select GFXUMA
select SUPERIO_FINTEK_F81866D
- select GENERIC_SPD_BIN
+ select HAVE_SPD_IN_CBFS
config MAINBOARD_DIR
string
diff --git a/src/mainboard/facebook/fbg1701/Kconfig b/src/mainboard/facebook/fbg1701/Kconfig
index ca19e0582c..0f23ed2a0a 100644
--- a/src/mainboard/facebook/fbg1701/Kconfig
+++ b/src/mainboard/facebook/fbg1701/Kconfig
@@ -19,7 +19,7 @@ config BOARD_SPECIFIC_OPTIONS
select CACHE_MRC_SETTINGS
select DISABLE_HPET
select INTEL_GMA_HAVE_VBT
- select GENERIC_SPD_BIN
+ select HAVE_SPD_IN_CBFS
select USE_VENDORCODE_ELTAN
config ONBOARD_SAMSUNG_MEM
diff --git a/src/mainboard/gizmosphere/gizmo/Kconfig b/src/mainboard/gizmosphere/gizmo/Kconfig
index 58f196f528..0d07bdba06 100644
--- a/src/mainboard/gizmosphere/gizmo/Kconfig
+++ b/src/mainboard/gizmosphere/gizmo/Kconfig
@@ -14,7 +14,7 @@ config BOARD_SPECIFIC_OPTIONS
select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_2048
select GFXUMA
- select GENERIC_SPD_BIN
+ select HAVE_SPD_IN_CBFS
config MAINBOARD_DIR
string
diff --git a/src/mainboard/gizmosphere/gizmo2/Kconfig b/src/mainboard/gizmosphere/gizmo2/Kconfig
index 5ea1b43a47..6375bc4982 100644
--- a/src/mainboard/gizmosphere/gizmo2/Kconfig
+++ b/src/mainboard/gizmosphere/gizmo2/Kconfig
@@ -16,7 +16,7 @@ config BOARD_SPECIFIC_OPTIONS
select BOARD_ROMSIZE_KB_4096
select GFXUMA
select HUDSON_IMC_ENABLE
- select GENERIC_SPD_BIN
+ select HAVE_SPD_IN_CBFS
config MAINBOARD_DIR
string
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
diff --git a/src/mainboard/hp/snb_ivb_laptops/Kconfig.name b/src/mainboard/hp/snb_ivb_laptops/Kconfig.name
index 8a271909bc..85f95b27bf 100644
--- a/src/mainboard/hp/snb_ivb_laptops/Kconfig.name
+++ b/src/mainboard/hp/snb_ivb_laptops/Kconfig.name
@@ -99,7 +99,7 @@ config BOARD_HP_REVOLVE_810_G1
select BOARD_HP_SNB_IVB_LAPTOPS
select BOARD_ROMSIZE_KB_16384
- select GENERIC_SPD_BIN
+ select HAVE_SPD_IN_CBFS
select GFX_GMA_PANEL_1_ON_LVDS
select INTEL_INT15
select INTEL_GMA_HAVE_VBT
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
diff --git a/src/mainboard/lenovo/s230u/Kconfig b/src/mainboard/lenovo/s230u/Kconfig
index f1e575f0a6..fde744ff4d 100644
--- a/src/mainboard/lenovo/s230u/Kconfig
+++ b/src/mainboard/lenovo/s230u/Kconfig
@@ -18,7 +18,7 @@ config BOARD_SPECIFIC_OPTIONS
select SERIRQ_CONTINUOUS_MODE
select MAINBOARD_HAS_LPC_TPM
select MAINBOARD_HAS_TPM1
- select GENERIC_SPD_BIN
+ select HAVE_SPD_IN_CBFS
config MAINBOARD_DIR
string
diff --git a/src/mainboard/lenovo/t430s/Kconfig b/src/mainboard/lenovo/t430s/Kconfig
index 1c0586d562..6f1568d16c 100644
--- a/src/mainboard/lenovo/t430s/Kconfig
+++ b/src/mainboard/lenovo/t430s/Kconfig
@@ -24,7 +24,7 @@ config BOARD_SPECIFIC_OPTIONS
select INTEL_GMA_HAVE_VBT
select MAINBOARD_USES_IFD_GBE_REGION
select DRIVERS_RICOH_RCE822 if BOARD_LENOVO_T431S
- select GENERIC_SPD_BIN if BOARD_LENOVO_T431S
+ select HAVE_SPD_IN_CBFS if BOARD_LENOVO_T431S
# Workaround for EC/KBC IRQ1.
select SERIRQ_CONTINUOUS_MODE
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig
index cff79031b2..0bec670a2b 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig
+++ b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig
@@ -22,7 +22,7 @@ config BOARD_SPECIFIC_OPTIONS
select MAINBOARD_HAS_LIBGFXINIT
select GFX_GMA_PANEL_1_ON_LVDS
select INTEL_GMA_HAVE_VBT
- select GENERIC_SPD_BIN
+ select HAVE_SPD_IN_CBFS
# Workaround for EC/KBC IRQ1.
select SERIRQ_CONTINUOUS_MODE
diff --git a/src/mainboard/pcengines/apu1/Kconfig b/src/mainboard/pcengines/apu1/Kconfig
index f2f3b08d84..bbcef27b4d 100644
--- a/src/mainboard/pcengines/apu1/Kconfig
+++ b/src/mainboard/pcengines/apu1/Kconfig
@@ -15,7 +15,7 @@ config BOARD_SPECIFIC_OPTIONS
select HAVE_OPTION_TABLE
select HAVE_CMOS_DEFAULT
select BOARD_ROMSIZE_KB_2048
- select GENERIC_SPD_BIN
+ select HAVE_SPD_IN_CBFS
select SEABIOS_ADD_SERCON_PORT_FILE if PAYLOAD_SEABIOS
select MAINBOARD_HAS_LPC_TPM
diff --git a/src/mainboard/pcengines/apu2/Kconfig b/src/mainboard/pcengines/apu2/Kconfig
index 25cc277927..fde73405c4 100644
--- a/src/mainboard/pcengines/apu2/Kconfig
+++ b/src/mainboard/pcengines/apu2/Kconfig
@@ -14,7 +14,7 @@ config BOARD_SPECIFIC_OPTIONS
select HAVE_MP_TABLE
select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_8192
- select GENERIC_SPD_BIN
+ select HAVE_SPD_IN_CBFS
select MAINBOARD_HAS_LPC_TPM
select SEABIOS_ADD_SERCON_PORT_FILE if PAYLOAD_SEABIOS
select PCIEXP_ASPM
diff --git a/src/mainboard/portwell/m107/Kconfig b/src/mainboard/portwell/m107/Kconfig
index f813b8e500..bc06151633 100644
--- a/src/mainboard/portwell/m107/Kconfig
+++ b/src/mainboard/portwell/m107/Kconfig
@@ -12,7 +12,7 @@ config BOARD_SPECIFIC_OPTIONS
select HAVE_FSP_BIN
select CACHE_MRC_SETTINGS
select DISABLE_HPET
- select GENERIC_SPD_BIN
+ select HAVE_SPD_IN_CBFS
choice
prompt "Onboard memory manufacturer"
diff --git a/src/mainboard/razer/blade_stealth_kbl/Kconfig b/src/mainboard/razer/blade_stealth_kbl/Kconfig
index 532bd76c45..31c29cd31b 100644
--- a/src/mainboard/razer/blade_stealth_kbl/Kconfig
+++ b/src/mainboard/razer/blade_stealth_kbl/Kconfig
@@ -10,7 +10,7 @@ config BOARD_SPECIFIC_OPTIONS
select MAINBOARD_HAS_LPC_TPM
select MAINBOARD_HAS_TPM2
select MAINBOARD_HAS_LIBGFXINIT
- select GENERIC_SPD_BIN
+ select HAVE_SPD_IN_CBFS
select DRIVERS_I2C_HID
select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES
diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig
index 237076f8c2..7d73bc7b99 100644
--- a/src/mainboard/samsung/lumpy/Kconfig
+++ b/src/mainboard/samsung/lumpy/Kconfig
@@ -24,7 +24,7 @@ config BOARD_SPECIFIC_OPTIONS
select DRIVERS_GENERIC_IOAPIC
select INTEL_INT15
select SANDYBRIDGE_VBOOT_IN_ROMSTAGE
- select GENERIC_SPD_BIN
+ select HAVE_SPD_IN_CBFS
config VBOOT
select VBOOT_VBNV_CMOS
diff --git a/src/mainboard/system76/lemp9/Kconfig b/src/mainboard/system76/lemp9/Kconfig
index 3c844d9f69..498a429b63 100644
--- a/src/mainboard/system76/lemp9/Kconfig
+++ b/src/mainboard/system76/lemp9/Kconfig
@@ -8,7 +8,7 @@ config BOARD_SPECIFIC_OPTIONS
select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES
select HAVE_SMI_HANDLER
- select GENERIC_SPD_BIN
+ select HAVE_SPD_IN_CBFS
select INTEL_GMA_HAVE_VBT
select INTEL_LPSS_UART_FOR_CONSOLE
select MAINBOARD_HAS_LPC_TPM