src/*/intel/: clarify Kconfig options regarding IFD
HAVE_INTEL_FIRMWARE is used to enable certain options that rely on a valid Inter Flash Descriptor to exist. It does *not* identify platforms or boards that are capable of running in descriptor mode if it's valid. Refine the help text to make this clear. Introduce a new option INTEL_DESCRIPTOR_MODE_CAPABLE that does simply declare that IFD is supported by the platform. Select this value everywhere instead of the HAVE_INTEL_FIRMWARE and default HAVE_INTEL_FIRMWARE to y if INTEL_DESCRIPTOR_MODE_CAPABLE is selected. Move the QEMU Q35 special case (deselection of HAVE_INTEL_FIRMWARE) to the mainboard directory. Change-Id: I4791fce03982bf0443bf0b8e26d9f4f06c6f2060 Signed-off-by: Stefan Tauner <stefan.tauner@gmx.at> Reviewed-on: https://review.coreboot.org/28371 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Philipp Deppenwiese <zaolin.daisuki@gmail.com> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
parent
9fc7b8e973
commit
ef8b95745f
|
@ -36,4 +36,9 @@ config DCACHE_RAM_SIZE
|
|||
hex
|
||||
default 0x10000
|
||||
|
||||
# Do not show IFD/blob options since QEMU doesn't care
|
||||
config HAVE_INTEL_FIRMWARE
|
||||
bool
|
||||
default n
|
||||
|
||||
endif # BOARD_EMULATION_QEMU_X86_Q35
|
||||
|
|
|
@ -45,7 +45,7 @@ config CPU_SPECIFIC_OPTIONS
|
|||
select COMMON_FADT
|
||||
select FSP_PLATFORM_MEMORY_SETTINGS_VERSIONS
|
||||
select GENERIC_GPIO_LIB
|
||||
select HAVE_INTEL_FIRMWARE
|
||||
select INTEL_DESCRIPTOR_MODE_CAPABLE
|
||||
select HAVE_SMI_HANDLER
|
||||
select MRC_SETTINGS_PROTECT
|
||||
select MRC_SETTINGS_VARIABLE_DATA
|
||||
|
|
|
@ -34,7 +34,7 @@ config CPU_SPECIFIC_OPTIONS
|
|||
select TSC_SYNC_MFENCE
|
||||
select UDELAY_TSC
|
||||
select SOC_INTEL_COMMON
|
||||
select HAVE_INTEL_FIRMWARE
|
||||
select INTEL_DESCRIPTOR_MODE_CAPABLE
|
||||
select HAVE_SPI_CONSOLE_SUPPORT
|
||||
select INTEL_GMA_ACPI
|
||||
select INTEL_GMA_SWSMISCI
|
||||
|
|
|
@ -42,7 +42,7 @@ config CPU_SPECIFIC_OPTIONS
|
|||
select TSC_SYNC_MFENCE
|
||||
select UDELAY_TSC
|
||||
select USE_GENERIC_FSP_CAR_INC
|
||||
select HAVE_INTEL_FIRMWARE
|
||||
select INTEL_DESCRIPTOR_MODE_CAPABLE
|
||||
select HAVE_SPI_CONSOLE_SUPPORT
|
||||
select HAVE_FSP_GOP
|
||||
select GENERIC_GPIO_LIB
|
||||
|
|
|
@ -35,7 +35,7 @@ config CPU_SPECIFIC_OPTIONS
|
|||
select TSC_SYNC_MFENCE
|
||||
select UDELAY_TSC
|
||||
select SOC_INTEL_COMMON
|
||||
select HAVE_INTEL_FIRMWARE
|
||||
select INTEL_DESCRIPTOR_MODE_CAPABLE
|
||||
select SOC_INTEL_COMMON_ACPI_WAKE_SOURCE
|
||||
select HAVE_SPI_CONSOLE_SUPPORT
|
||||
select CPU_INTEL_COMMON
|
||||
|
|
|
@ -36,7 +36,7 @@ config CPU_SPECIFIC_OPTIONS
|
|||
select GENERIC_GPIO_LIB
|
||||
select HAVE_FSP_GOP
|
||||
select HAVE_HARD_RESET
|
||||
select HAVE_INTEL_FIRMWARE
|
||||
select INTEL_DESCRIPTOR_MODE_CAPABLE
|
||||
select HAVE_MONOTONIC_TIMER
|
||||
select HAVE_SMI_HANDLER
|
||||
select IDT_IN_EVERY_STAGE
|
||||
|
|
|
@ -43,6 +43,7 @@ config CPU_SPECIFIC_OPTIONS
|
|||
select PARALLEL_MP
|
||||
select PCR_COMMON_IOSF_1_0
|
||||
select SMP
|
||||
select INTEL_DESCRIPTOR_MODE_CAPABLE
|
||||
select SOC_INTEL_COMMON_BLOCK
|
||||
select SOC_INTEL_COMMON_BLOCK_CPU
|
||||
# select SOC_INTEL_COMMON_BLOCK_SA
|
||||
|
|
|
@ -41,7 +41,7 @@ config CPU_SPECIFIC_OPTIONS
|
|||
select TSC_SYNC_MFENCE
|
||||
select UDELAY_TSC
|
||||
select SUPPORT_CPU_UCODE_IN_CBFS
|
||||
select HAVE_INTEL_FIRMWARE
|
||||
select INTEL_DESCRIPTOR_MODE_CAPABLE
|
||||
select HAVE_SPI_CONSOLE_SUPPORT
|
||||
|
||||
# Microcode header files are delivered in FSP package
|
||||
|
|
|
@ -22,7 +22,7 @@ config CPU_SPECIFIC_OPTIONS
|
|||
select SUPPORT_CPU_UCODE_IN_CBFS
|
||||
# Microcode header files are delivered in FSP package
|
||||
select USES_MICROCODE_HEADER_FILES if HAVE_FSP_BIN
|
||||
select HAVE_INTEL_FIRMWARE
|
||||
select INTEL_DESCRIPTOR_MODE_CAPABLE
|
||||
select SMM_TSEG
|
||||
select HAVE_SMI_HANDLER
|
||||
select TSC_MONOTONIC_TIMER
|
||||
|
|
|
@ -32,7 +32,7 @@ config CPU_SPECIFIC_OPTIONS
|
|||
select GENERIC_GPIO_LIB
|
||||
select HAVE_FSP_GOP
|
||||
select HAVE_HARD_RESET
|
||||
select HAVE_INTEL_FIRMWARE
|
||||
select INTEL_DESCRIPTOR_MODE_CAPABLE
|
||||
select HAVE_MONOTONIC_TIMER
|
||||
select HAVE_SMI_HANDLER
|
||||
select INTEL_GMA_ACPI
|
||||
|
|
|
@ -37,7 +37,7 @@ config SOUTH_BRIDGE_OPTIONS # dummy
|
|||
select PCIEXP_COMMON_CLOCK
|
||||
select COMMON_FADT
|
||||
select ACPI_SATA_GENERATOR
|
||||
select HAVE_INTEL_FIRMWARE
|
||||
select INTEL_DESCRIPTOR_MODE_CAPABLE
|
||||
select SOUTHBRIDGE_INTEL_COMMON_GPIO
|
||||
select RTC
|
||||
select HAVE_INTEL_CHIPSET_LOCKDOWN
|
||||
|
|
|
@ -25,6 +25,12 @@ config HAVE_INTEL_CHIPSET_LOCKDOWN
|
|||
config SOUTHBRIDGE_INTEL_COMMON_SMM
|
||||
def_bool n
|
||||
|
||||
config INTEL_DESCRIPTOR_MODE_CAPABLE
|
||||
def_bool n
|
||||
help
|
||||
This config simply states that the platform is *capable* of running in
|
||||
descriptor mode (when the descriptor in flash is valid).
|
||||
|
||||
config INTEL_CHIPSET_LOCKDOWN
|
||||
depends on HAVE_INTEL_CHIPSET_LOCKDOWN && HAVE_SMI_HANDLER && !CHROMEOS
|
||||
#ChromeOS's payload seems to handle finalization on its on.
|
||||
|
|
|
@ -16,9 +16,12 @@
|
|||
|
||||
config HAVE_INTEL_FIRMWARE
|
||||
bool
|
||||
default y if INTEL_DESCRIPTOR_MODE_CAPABLE
|
||||
help
|
||||
Chipset uses the Intel Firmware Descriptor to describe the
|
||||
layout of the SPI ROM chip.
|
||||
Platform uses the Intel Firmware Descriptor to describe the
|
||||
layout of the SPI ROM chip. Enabling this option will allow you to
|
||||
select further features that rely on this like providing individual
|
||||
firmware blobs.
|
||||
|
||||
if HAVE_INTEL_FIRMWARE
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@ config SOUTH_BRIDGE_OPTIONS # dummy
|
|||
select PCIEXP_ASPM
|
||||
select PCIEXP_COMMON_CLOCK
|
||||
select COMMON_FADT
|
||||
select HAVE_INTEL_FIRMWARE
|
||||
select INTEL_DESCRIPTOR_MODE_CAPABLE
|
||||
select SOUTHBRIDGE_INTEL_COMMON
|
||||
select SOUTHBRIDGE_INTEL_COMMON_SMBUS
|
||||
select SOUTHBRIDGE_INTEL_COMMON_SPI
|
||||
|
|
|
@ -29,7 +29,7 @@ config SOUTH_BRIDGE_OPTIONS # dummy
|
|||
select PCIEXP_ASPM
|
||||
select PCIEXP_COMMON_CLOCK
|
||||
select COMMON_FADT
|
||||
select HAVE_INTEL_FIRMWARE
|
||||
select INTEL_DESCRIPTOR_MODE_CAPABLE
|
||||
select NO_EARLY_BOOTBLOCK_POSTCODES
|
||||
select SOUTHBRIDGE_INTEL_COMMON
|
||||
select SOUTHBRIDGE_INTEL_COMMON_SMBUS
|
||||
|
|
|
@ -29,7 +29,7 @@ config SOUTH_BRIDGE_OPTIONS # dummy
|
|||
select PCIEXP_ASPM
|
||||
select PCIEXP_COMMON_CLOCK
|
||||
select SPI_FLASH
|
||||
select HAVE_INTEL_FIRMWARE
|
||||
select INTEL_DESCRIPTOR_MODE_CAPABLE
|
||||
select SOUTHBRIDGE_INTEL_COMMON
|
||||
select SOUTHBRIDGE_INTEL_COMMON_SMBUS
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@ config SOUTHBRIDGE_INTEL_I82801IX
|
|||
select HAVE_USBDEBUG_OPTIONS
|
||||
select SOUTHBRIDGE_INTEL_COMMON_GPIO
|
||||
select SOUTHBRIDGE_INTEL_COMMON_SMM
|
||||
select HAVE_INTEL_FIRMWARE if !BOARD_EMULATION_QEMU_X86_Q35
|
||||
select INTEL_DESCRIPTOR_MODE_CAPABLE
|
||||
select ACPI_INTEL_HARDWARE_SLEEP_VALUES
|
||||
|
||||
if SOUTHBRIDGE_INTEL_I82801IX
|
||||
|
|
|
@ -27,7 +27,7 @@ config SOUTHBRIDGE_INTEL_I82801JX
|
|||
select HAVE_SMI_HANDLER
|
||||
select HAVE_USBDEBUG_OPTIONS
|
||||
select SOUTHBRIDGE_INTEL_COMMON_GPIO
|
||||
select HAVE_INTEL_FIRMWARE
|
||||
select INTEL_DESCRIPTOR_MODE_CAPABLE
|
||||
select COMMON_FADT
|
||||
|
||||
if SOUTHBRIDGE_INTEL_I82801JX
|
||||
|
|
|
@ -35,7 +35,7 @@ config SOUTH_BRIDGE_OPTIONS # dummy
|
|||
select HAVE_USBDEBUG_OPTIONS
|
||||
select COMMON_FADT
|
||||
select ACPI_SATA_GENERATOR
|
||||
select HAVE_INTEL_FIRMWARE
|
||||
select INTEL_DESCRIPTOR_MODE_CAPABLE
|
||||
select SOUTHBRIDGE_INTEL_COMMON_GPIO
|
||||
select HAVE_INTEL_CHIPSET_LOCKDOWN
|
||||
|
||||
|
|
|
@ -30,7 +30,7 @@ config SOUTH_BRIDGE_OPTIONS # dummy
|
|||
select USE_WATCHDOG_ON_BOOT
|
||||
select PCIEXP_ASPM
|
||||
select PCIEXP_COMMON_CLOCK
|
||||
select HAVE_INTEL_FIRMWARE
|
||||
select INTEL_DESCRIPTOR_MODE_CAPABLE
|
||||
select HAVE_SPI_CONSOLE_SUPPORT
|
||||
select RTC
|
||||
select SOUTHBRIDGE_INTEL_COMMON_GPIO if !INTEL_LYNXPOINT_LP
|
||||
|
|
Loading…
Reference in New Issue