From c3e7d833dd1acbc1724806894f4d685f8a8d0717 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Sun, 26 May 2024 16:17:36 -0600 Subject: 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 Change-Id: Icf170dc2ef790d6f5a897a9c7c2ea64033bf1dc9 Reviewed-on: https://review.coreboot.org/c/coreboot/+/83118 Reviewed-by: Matt DeVillier Tested-by: build bot (Jenkins) Reviewed-by: Elyes Haouas Reviewed-by: Nico Huber --- src/Kconfig | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/Kconfig b/src/Kconfig index 1ec7552e60..ef3c72cc2d 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -506,42 +506,38 @@ config BOOTSPLASH_CONVERT_COLORSWAP If your colors seem all wrong, try this option. config FW_CONFIG - bool "Firmware Configuration Probing" - default n + bool help Enable support for probing devices with fw_config. This is a simple bitmask broken into fields and options for probing. + Select this option in the Mainboard Kconfig. config FW_CONFIG_SOURCE_CHROMEEC_CBI - bool "Obtain Firmware Configuration value from Google Chrome EC CBI" + bool depends on FW_CONFIG && EC_GOOGLE_CHROMEEC - default n help This option tells coreboot to read the firmware configuration value from the Google Chrome Embedded Controller CBI interface. This source is not tried if FW_CONFIG_SOURCE_CBFS is enabled and the value was found in CBFS. + Select this option in the Mainboard Kconfig. config FW_CONFIG_SOURCE_CBFS bool "Obtain Firmware Configuration value from CBFS" depends on FW_CONFIG - default n help With this option enabled coreboot will look for the 32bit firmware configuration value in CBFS at the selected prefix with the file name - "fw_config". This option will override other sources and allow the - local image to preempt the mainboard selected source and can be used as - FW_CONFIG_SOURCE_CHROMEEC_CBI fallback option. + "fw_config". This option gets run if no value is found with CBI, so acts + as a FW_CONFIG_SOURCE_CHROMEEC_CBI fallback option. config FW_CONFIG_SOURCE_VPD bool "Obtain Firmware Configuration value from VPD" depends on FW_CONFIG && VPD - default n help With this option enabled coreboot will look for the 32bit firmware - configuration value in VPD key name "fw_config". This option will - override other sources and allow the local image to preempt the mainboard - selected source and can be used for other FW_CONFIG_SOURCEs fallback option. + configuration value in VPD key name "fw_config". This option runs if no + FW_CONFIG value is set by either CBI or CBFS. config HAVE_RAMPAYLOAD bool -- cgit v1.2.3