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>
This commit is contained in:
Michael Niewöhner 2020-09-07 14:26:09 +02:00
parent 83f0c699c7
commit 87cc889e8b
36 changed files with 39 additions and 39 deletions

View File

@ -30,7 +30,7 @@ config FLATTENED_DEVICE_TREE
Selected by features that require to parse and manipulate a flattened Selected by features that require to parse and manipulate a flattened
devicetree in ramstage. devicetree in ramstage.
config GENERIC_SPD_BIN config HAVE_SPD_IN_CBFS
bool bool
help help
If enabled, add support for adding spd.hex files in cbfs as spd.bin If enabled, add support for adding spd.hex files in cbfs as spd.bin

View File

@ -350,7 +350,7 @@ endif # CONFIG_RAMSTAGE_LIBHWBASE
romstage-y += spd_bin.c 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_BIN = $(obj)/spd.bin
LIB_SPD_DEPS = $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/spd/$(f).spd.hex) 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; \
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-file := $(LIB_SPD_BIN)
spd.bin-type := spd spd.bin-type := spd
endif endif

View File

@ -15,7 +15,7 @@ config BOARD_SPECIFIC_OPTIONS
select BOARD_ROMSIZE_KB_4096 select BOARD_ROMSIZE_KB_4096
select GFXUMA select GFXUMA
select SUPERIO_FINTEK_F81866D select SUPERIO_FINTEK_F81866D
select GENERIC_SPD_BIN select HAVE_SPD_IN_CBFS
config MAINBOARD_DIR config MAINBOARD_DIR
string string

View File

@ -19,7 +19,7 @@ config BOARD_SPECIFIC_OPTIONS
select CACHE_MRC_SETTINGS select CACHE_MRC_SETTINGS
select DISABLE_HPET select DISABLE_HPET
select INTEL_GMA_HAVE_VBT select INTEL_GMA_HAVE_VBT
select GENERIC_SPD_BIN select HAVE_SPD_IN_CBFS
select USE_VENDORCODE_ELTAN select USE_VENDORCODE_ELTAN
config ONBOARD_SAMSUNG_MEM config ONBOARD_SAMSUNG_MEM

View File

@ -14,7 +14,7 @@ config BOARD_SPECIFIC_OPTIONS
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_2048 select BOARD_ROMSIZE_KB_2048
select GFXUMA select GFXUMA
select GENERIC_SPD_BIN select HAVE_SPD_IN_CBFS
config MAINBOARD_DIR config MAINBOARD_DIR
string string

View File

@ -16,7 +16,7 @@ config BOARD_SPECIFIC_OPTIONS
select BOARD_ROMSIZE_KB_4096 select BOARD_ROMSIZE_KB_4096
select GFXUMA select GFXUMA
select HUDSON_IMC_ENABLE select HUDSON_IMC_ENABLE
select GENERIC_SPD_BIN select HAVE_SPD_IN_CBFS
config MAINBOARD_DIR config MAINBOARD_DIR
string string

View File

@ -15,7 +15,7 @@ config BOARD_GOOGLE_BASEBOARD_AURON
select MAINBOARD_HAS_TPM1 select MAINBOARD_HAS_TPM1
select INTEL_INT15 select INTEL_INT15
select SYSTEM_TYPE_LAPTOP if !BOARD_GOOGLE_BUDDY 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 if BOARD_GOOGLE_BASEBOARD_AURON

View File

@ -17,7 +17,7 @@ config BOARD_GOOGLE_BASEBOARD_CYAN
select PCIEXP_L1_SUB_STATE if !BOARD_GOOGLE_CYAN select PCIEXP_L1_SUB_STATE if !BOARD_GOOGLE_CYAN
select SYSTEM_TYPE_LAPTOP select SYSTEM_TYPE_LAPTOP
select USE_GOOGLE_FSP select USE_GOOGLE_FSP
select GENERIC_SPD_BIN select HAVE_SPD_IN_CBFS
if BOARD_GOOGLE_BASEBOARD_CYAN if BOARD_GOOGLE_BASEBOARD_CYAN

View File

@ -23,7 +23,7 @@ config BOARD_GOOGLE_BASEBOARD_DEDEDE
select SOC_INTEL_JASPERLAKE select SOC_INTEL_JASPERLAKE
select SOC_INTEL_COMMON_BLOCK_DTT select SOC_INTEL_COMMON_BLOCK_DTT
select SOC_INTEL_CSE_LITE_SKU 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 DRIVERS_INTEL_MIPI_CAMERA
select SOC_INTEL_COMMON_BLOCK_IPU select SOC_INTEL_COMMON_BLOCK_IPU

View File

@ -22,7 +22,7 @@ config BOARD_GOOGLE_BASEBOARD_DRALLION
select SYSTEM_TYPE_LAPTOP select SYSTEM_TYPE_LAPTOP
select TPM2 select TPM2
select MAINBOARD_USES_IFD_EC_REGION select MAINBOARD_USES_IFD_EC_REGION
select GENERIC_SPD_BIN select HAVE_SPD_IN_CBFS
if BOARD_GOOGLE_BASEBOARD_DRALLION if BOARD_GOOGLE_BASEBOARD_DRALLION

View File

@ -22,7 +22,7 @@ config BOARD_SPECIFIC_OPTIONS
select MAINBOARD_HAS_TPM2 select MAINBOARD_HAS_TPM2
select SOC_INTEL_KABYLAKE select SOC_INTEL_KABYLAKE
select SYSTEM_TYPE_CONVERTIBLE select SYSTEM_TYPE_CONVERTIBLE
select GENERIC_SPD_BIN select HAVE_SPD_IN_CBFS
config VBOOT config VBOOT
select EC_GOOGLE_CHROMEEC_SWITCHES select EC_GOOGLE_CHROMEEC_SWITCHES

View File

@ -21,7 +21,7 @@ config BOARD_GOOGLE_BASEBOARD_GLADOS
select SYSTEM_TYPE_LAPTOP select SYSTEM_TYPE_LAPTOP
select MAINBOARD_HAS_LIBGFXINIT select MAINBOARD_HAS_LIBGFXINIT
select MAINBOARD_NO_FSP_GOP if !BOARD_GOOGLE_GLADOS select MAINBOARD_NO_FSP_GOP if !BOARD_GOOGLE_GLADOS
select GENERIC_SPD_BIN select HAVE_SPD_IN_CBFS
if BOARD_GOOGLE_BASEBOARD_GLADOS if BOARD_GOOGLE_BASEBOARD_GLADOS

View File

@ -81,7 +81,7 @@ config DIMM_SPD_SIZE
config ROMSTAGE_SPD_CBFS config ROMSTAGE_SPD_CBFS
bool bool
default y if !ROMSTAGE_SPD_SMBUS default y if !ROMSTAGE_SPD_SMBUS
select GENERIC_SPD_BIN select HAVE_SPD_IN_CBFS
config ROMSTAGE_SPD_SMBUS config ROMSTAGE_SPD_SMBUS
bool bool

View File

@ -14,7 +14,7 @@ config BOARD_GOOGLE_BASEBOARD_KAHLEE
select EC_GOOGLE_CHROMEEC_BOARDID select EC_GOOGLE_CHROMEEC_BOARDID
select EC_GOOGLE_CHROMEEC_LPC select EC_GOOGLE_CHROMEEC_LPC
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select GENERIC_SPD_BIN select HAVE_SPD_IN_CBFS
select GFXUMA select GFXUMA
select GOOGLE_SMBIOS_MAINBOARD_VERSION select GOOGLE_SMBIOS_MAINBOARD_VERSION
select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_CHROMEOS

View File

@ -8,7 +8,7 @@ config BOARD_SPECIFIC_OPTIONS
select BOARD_ROMSIZE_KB_8192 select BOARD_ROMSIZE_KB_8192
select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_LPC select EC_GOOGLE_CHROMEEC_LPC
select GENERIC_SPD_BIN select HAVE_SPD_IN_CBFS
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select HAVE_OPTION_TABLE select HAVE_OPTION_TABLE
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME

View File

@ -15,7 +15,7 @@ config BOARD_GOOGLE_BASEBOARD_POPPY
select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_CHROMEOS
select SOC_INTEL_KABYLAKE select SOC_INTEL_KABYLAKE
select MAINBOARD_HAS_TPM2 select MAINBOARD_HAS_TPM2
select GENERIC_SPD_BIN select HAVE_SPD_IN_CBFS
if BOARD_GOOGLE_BASEBOARD_POPPY if BOARD_GOOGLE_BASEBOARD_POPPY

View File

@ -14,7 +14,7 @@ config BOARD_GOOGLE_BASEBOARD_RAMBI
select MAINBOARD_HAS_LPC_TPM select MAINBOARD_HAS_LPC_TPM
select MAINBOARD_HAS_TPM1 select MAINBOARD_HAS_TPM1
select SYSTEM_TYPE_LAPTOP if !BOARD_GOOGLE_NINJA && !BOARD_GOOGLE_SUMO 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 if BOARD_GOOGLE_BASEBOARD_RAMBI

View File

@ -17,7 +17,7 @@ config BOARD_GOOGLE_BASEBOARD_SLIPPY
select MAINBOARD_HAS_LIBGFXINIT select MAINBOARD_HAS_LIBGFXINIT
select INTEL_GMA_HAVE_VBT select INTEL_GMA_HAVE_VBT
select DRIVERS_I2C_RTD2132 if BOARD_GOOGLE_LEON select DRIVERS_I2C_RTD2132 if BOARD_GOOGLE_LEON
select GENERIC_SPD_BIN select HAVE_SPD_IN_CBFS
if BOARD_GOOGLE_BASEBOARD_SLIPPY if BOARD_GOOGLE_BASEBOARD_SLIPPY

View File

@ -27,7 +27,7 @@ config BOARD_GOOGLE_BASEBOARD_VOLTEER
select MAINBOARD_HAS_TPM2 select MAINBOARD_HAS_TPM2
select PCIEXP_HOTPLUG select PCIEXP_HOTPLUG
select SOC_INTEL_TIGERLAKE select SOC_INTEL_TIGERLAKE
select GENERIC_SPD_BIN select HAVE_SPD_IN_CBFS
if BOARD_GOOGLE_BASEBOARD_VOLTEER if BOARD_GOOGLE_BASEBOARD_VOLTEER

View File

@ -99,7 +99,7 @@ config BOARD_HP_REVOLVE_810_G1
select BOARD_HP_SNB_IVB_LAPTOPS select BOARD_HP_SNB_IVB_LAPTOPS
select BOARD_ROMSIZE_KB_16384 select BOARD_ROMSIZE_KB_16384
select GENERIC_SPD_BIN select HAVE_SPD_IN_CBFS
select GFX_GMA_PANEL_1_ON_LVDS select GFX_GMA_PANEL_1_ON_LVDS
select INTEL_INT15 select INTEL_INT15
select INTEL_GMA_HAVE_VBT select INTEL_GMA_HAVE_VBT

View File

@ -3,11 +3,11 @@ if BOARD_INTEL_CANNONLAKE_RVPU || BOARD_INTEL_CANNONLAKE_RVPY
config BOARD_SPECIFIC_OPTIONS config BOARD_SPECIFIC_OPTIONS
def_bool y def_bool y
select BOARD_ROMSIZE_KB_16384 select BOARD_ROMSIZE_KB_16384
select GENERIC_SPD_BIN select HAVE_SPD_IN_CBFS
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_CHROMEOS
select GENERIC_SPD_BIN select HAVE_SPD_IN_CBFS
select DRIVERS_I2C_HID select DRIVERS_I2C_HID
select DRIVERS_I2C_GENERIC select DRIVERS_I2C_GENERIC
select DRIVERS_I2C_DA7219 select DRIVERS_I2C_DA7219

View File

@ -19,7 +19,7 @@ config MAINBOARD_PART_NUMBER
config ENABLE_FSP_MEMORY_DOWN config ENABLE_FSP_MEMORY_DOWN
bool "Enable Memory Down" bool "Enable Memory Down"
default n default n
select GENERIC_SPD_BIN select HAVE_SPD_IN_CBFS
help help
Select this option to enable Memory Down function. Select this option to enable Memory Down function.

View File

@ -4,11 +4,11 @@ config BOARD_SPECIFIC_OPTIONS
def_bool y def_bool y
select BOARD_ROMSIZE_KB_16384 select BOARD_ROMSIZE_KB_16384
select EC_ACPI select EC_ACPI
select GENERIC_SPD_BIN select HAVE_SPD_IN_CBFS
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_CHROMEOS
select GENERIC_SPD_BIN select HAVE_SPD_IN_CBFS
select DRIVERS_I2C_HID select DRIVERS_I2C_HID
select DRIVERS_I2C_GENERIC select DRIVERS_I2C_GENERIC
select DRIVERS_SPI_ACPI select DRIVERS_SPI_ACPI

View File

@ -13,7 +13,7 @@ config BOARD_SPECIFIC_OPTIONS
select DRIVERS_SPI_ACPI select DRIVERS_SPI_ACPI
select DRIVERS_USB_ACPI select DRIVERS_USB_ACPI
select EC_ACPI select EC_ACPI
select GENERIC_SPD_BIN select HAVE_SPD_IN_CBFS
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_CHROMEOS

View File

@ -12,7 +12,7 @@ config BOARD_SPECIFIC_OPTIONS
select SOC_INTEL_KABYLAKE select SOC_INTEL_KABYLAKE
select SKYLAKE_SOC_PCH_H if BOARD_INTEL_KBLRVP8 || BOARD_INTEL_KBLRVP11 select SKYLAKE_SOC_PCH_H if BOARD_INTEL_KBLRVP8 || BOARD_INTEL_KBLRVP11
select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_CHROMEOS
select GENERIC_SPD_BIN select HAVE_SPD_IN_CBFS
select MAINBOARD_HAS_LPC_TPM select MAINBOARD_HAS_LPC_TPM
select INTEL_LPSS_UART_FOR_CONSOLE select INTEL_LPSS_UART_FOR_CONSOLE
select MAINBOARD_USES_IFD_GBE_REGION if BOARD_INTEL_KBLRVP8 select MAINBOARD_USES_IFD_GBE_REGION if BOARD_INTEL_KBLRVP8

View File

@ -19,7 +19,7 @@ config BOARD_SPECIFIC_OPTIONS
select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_CHROMEOS
select MAINBOARD_HAS_LPC_TPM select MAINBOARD_HAS_LPC_TPM
select SOC_INTEL_SKYLAKE select SOC_INTEL_SKYLAKE
select GENERIC_SPD_BIN select HAVE_SPD_IN_CBFS
config VBOOT config VBOOT
select EC_GOOGLE_CHROMEEC_SWITCHES select EC_GOOGLE_CHROMEEC_SWITCHES

View File

@ -17,7 +17,7 @@ config BOARD_SPECIFIC_OPTIONS
select DRIVERS_INTEL_ISH select DRIVERS_INTEL_ISH
select EC_ACPI select EC_ACPI
select PCIEXP_HOTPLUG select PCIEXP_HOTPLUG
select GENERIC_SPD_BIN select HAVE_SPD_IN_CBFS
select SOC_INTEL_CSE_LITE_SKU select SOC_INTEL_CSE_LITE_SKU
config CHROMEOS config CHROMEOS

View File

@ -18,7 +18,7 @@ config BOARD_SPECIFIC_OPTIONS
select SERIRQ_CONTINUOUS_MODE select SERIRQ_CONTINUOUS_MODE
select MAINBOARD_HAS_LPC_TPM select MAINBOARD_HAS_LPC_TPM
select MAINBOARD_HAS_TPM1 select MAINBOARD_HAS_TPM1
select GENERIC_SPD_BIN select HAVE_SPD_IN_CBFS
config MAINBOARD_DIR config MAINBOARD_DIR
string string

View File

@ -24,7 +24,7 @@ config BOARD_SPECIFIC_OPTIONS
select INTEL_GMA_HAVE_VBT select INTEL_GMA_HAVE_VBT
select MAINBOARD_USES_IFD_GBE_REGION select MAINBOARD_USES_IFD_GBE_REGION
select DRIVERS_RICOH_RCE822 if BOARD_LENOVO_T431S 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. # Workaround for EC/KBC IRQ1.
select SERIRQ_CONTINUOUS_MODE select SERIRQ_CONTINUOUS_MODE

View File

@ -22,7 +22,7 @@ config BOARD_SPECIFIC_OPTIONS
select MAINBOARD_HAS_LIBGFXINIT select MAINBOARD_HAS_LIBGFXINIT
select GFX_GMA_PANEL_1_ON_LVDS select GFX_GMA_PANEL_1_ON_LVDS
select INTEL_GMA_HAVE_VBT select INTEL_GMA_HAVE_VBT
select GENERIC_SPD_BIN select HAVE_SPD_IN_CBFS
# Workaround for EC/KBC IRQ1. # Workaround for EC/KBC IRQ1.
select SERIRQ_CONTINUOUS_MODE select SERIRQ_CONTINUOUS_MODE

View File

@ -15,7 +15,7 @@ config BOARD_SPECIFIC_OPTIONS
select HAVE_OPTION_TABLE select HAVE_OPTION_TABLE
select HAVE_CMOS_DEFAULT select HAVE_CMOS_DEFAULT
select BOARD_ROMSIZE_KB_2048 select BOARD_ROMSIZE_KB_2048
select GENERIC_SPD_BIN select HAVE_SPD_IN_CBFS
select SEABIOS_ADD_SERCON_PORT_FILE if PAYLOAD_SEABIOS select SEABIOS_ADD_SERCON_PORT_FILE if PAYLOAD_SEABIOS
select MAINBOARD_HAS_LPC_TPM select MAINBOARD_HAS_LPC_TPM

View File

@ -14,7 +14,7 @@ config BOARD_SPECIFIC_OPTIONS
select HAVE_MP_TABLE select HAVE_MP_TABLE
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_8192 select BOARD_ROMSIZE_KB_8192
select GENERIC_SPD_BIN select HAVE_SPD_IN_CBFS
select MAINBOARD_HAS_LPC_TPM select MAINBOARD_HAS_LPC_TPM
select SEABIOS_ADD_SERCON_PORT_FILE if PAYLOAD_SEABIOS select SEABIOS_ADD_SERCON_PORT_FILE if PAYLOAD_SEABIOS
select PCIEXP_ASPM select PCIEXP_ASPM

View File

@ -12,7 +12,7 @@ config BOARD_SPECIFIC_OPTIONS
select HAVE_FSP_BIN select HAVE_FSP_BIN
select CACHE_MRC_SETTINGS select CACHE_MRC_SETTINGS
select DISABLE_HPET select DISABLE_HPET
select GENERIC_SPD_BIN select HAVE_SPD_IN_CBFS
choice choice
prompt "Onboard memory manufacturer" prompt "Onboard memory manufacturer"

View File

@ -10,7 +10,7 @@ config BOARD_SPECIFIC_OPTIONS
select MAINBOARD_HAS_LPC_TPM select MAINBOARD_HAS_LPC_TPM
select MAINBOARD_HAS_TPM2 select MAINBOARD_HAS_TPM2
select MAINBOARD_HAS_LIBGFXINIT select MAINBOARD_HAS_LIBGFXINIT
select GENERIC_SPD_BIN select HAVE_SPD_IN_CBFS
select DRIVERS_I2C_HID select DRIVERS_I2C_HID
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES

View File

@ -24,7 +24,7 @@ config BOARD_SPECIFIC_OPTIONS
select DRIVERS_GENERIC_IOAPIC select DRIVERS_GENERIC_IOAPIC
select INTEL_INT15 select INTEL_INT15
select SANDYBRIDGE_VBOOT_IN_ROMSTAGE select SANDYBRIDGE_VBOOT_IN_ROMSTAGE
select GENERIC_SPD_BIN select HAVE_SPD_IN_CBFS
config VBOOT config VBOOT
select VBOOT_VBNV_CMOS select VBOOT_VBNV_CMOS

View File

@ -8,7 +8,7 @@ config BOARD_SPECIFIC_OPTIONS
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select HAVE_SMI_HANDLER select HAVE_SMI_HANDLER
select GENERIC_SPD_BIN select HAVE_SPD_IN_CBFS
select INTEL_GMA_HAVE_VBT select INTEL_GMA_HAVE_VBT
select INTEL_LPSS_UART_FOR_CONSOLE select INTEL_LPSS_UART_FOR_CONSOLE
select MAINBOARD_HAS_LPC_TPM select MAINBOARD_HAS_LPC_TPM