Kconfig: Update FW_CONFIG Kconfig options

If a board supports FW_CONFIG or ChromeEC CBI, the options should be
selected by the mainboard. These are not something that need to be a
choice to enable or disable in Kconfig.

The defaults are pointless, so remove them. The symbols default to no.

Correct the descriptions of FW_CONFIG_SOURCE_CBFS and
FW_CONFIG_SOURCE_VPD. They come after CBI and do not override any other
options.

Signed-off-by: Martin Roth <gaumless@gmail.com>
Change-Id: Icf170dc2ef790d6f5a897a9c7c2ea64033bf1dc9
Reviewed-on: https://review.coreboot.org/c/coreboot/+/83118
Reviewed-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Martin Roth
2024-05-26 16:17:36 -06:00
committed by Nico Huber
parent dc0ae6bdc7
commit c3e7d833dd

View File

@ -506,42 +506,38 @@ config BOOTSPLASH_CONVERT_COLORSWAP
If your colors seem all wrong, try this option. If your colors seem all wrong, try this option.
config FW_CONFIG config FW_CONFIG
bool "Firmware Configuration Probing" bool
default n
help help
Enable support for probing devices with fw_config. This is a simple Enable support for probing devices with fw_config. This is a simple
bitmask broken into fields and options for probing. bitmask broken into fields and options for probing.
Select this option in the Mainboard Kconfig.
config FW_CONFIG_SOURCE_CHROMEEC_CBI config FW_CONFIG_SOURCE_CHROMEEC_CBI
bool "Obtain Firmware Configuration value from Google Chrome EC CBI" bool
depends on FW_CONFIG && EC_GOOGLE_CHROMEEC depends on FW_CONFIG && EC_GOOGLE_CHROMEEC
default n
help help
This option tells coreboot to read the firmware configuration value This option tells coreboot to read the firmware configuration value
from the Google Chrome Embedded Controller CBI interface. This source from the Google Chrome Embedded Controller CBI interface. This source
is not tried if FW_CONFIG_SOURCE_CBFS is enabled and the value was is not tried if FW_CONFIG_SOURCE_CBFS is enabled and the value was
found in CBFS. found in CBFS.
Select this option in the Mainboard Kconfig.
config FW_CONFIG_SOURCE_CBFS config FW_CONFIG_SOURCE_CBFS
bool "Obtain Firmware Configuration value from CBFS" bool "Obtain Firmware Configuration value from CBFS"
depends on FW_CONFIG depends on FW_CONFIG
default n
help help
With this option enabled coreboot will look for the 32bit firmware With this option enabled coreboot will look for the 32bit firmware
configuration value in CBFS at the selected prefix with the file name configuration value in CBFS at the selected prefix with the file name
"fw_config". This option will override other sources and allow the "fw_config". This option gets run if no value is found with CBI, so acts
local image to preempt the mainboard selected source and can be used as as a FW_CONFIG_SOURCE_CHROMEEC_CBI fallback option.
FW_CONFIG_SOURCE_CHROMEEC_CBI fallback option.
config FW_CONFIG_SOURCE_VPD config FW_CONFIG_SOURCE_VPD
bool "Obtain Firmware Configuration value from VPD" bool "Obtain Firmware Configuration value from VPD"
depends on FW_CONFIG && VPD depends on FW_CONFIG && VPD
default n
help help
With this option enabled coreboot will look for the 32bit firmware With this option enabled coreboot will look for the 32bit firmware
configuration value in VPD key name "fw_config". This option will configuration value in VPD key name "fw_config". This option runs if no
override other sources and allow the local image to preempt the mainboard FW_CONFIG value is set by either CBI or CBFS.
selected source and can be used for other FW_CONFIG_SOURCEs fallback option.
config HAVE_RAMPAYLOAD config HAVE_RAMPAYLOAD
bool bool