GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

device/Kconfig: Fix selection of software connection manager 

The patch that introduced the selection of software connection manager,
CB:64561 - 060df17f1d (soc/intel/alderlake/acpi: Add Kconfig options for
SCM and FCM) added a default to enable the software configuration
manager directly in the choice.

This leads to warnings when running make menuconfig:
src/soc/intel/alderlake/Kconfig:439:
warning: defaults for choice values not supported
src/soc/intel/meteorlake/Kconfig:337:
warning: defaults for choice values not supported
src/soc/intel/tigerlake/Kconfig:299:
warning: defaults for choice values not supported

I'm not sure why the Kconfig linter didn't catch this, but this
issue is currently breaking the build for me.  This patch fixes
it so that instead of setting the default directly, a new Kconfig
value is selected that then sets the default correctly.

Signed-off-by: Martin Roth <gaumless@gmail.com>
Change-Id: I674046a93af8f7c2f3003900804deefa89dae295
Reviewed-on: https://review.coreboot.org/c/coreboot/+/71776
Reviewed-by: Subrata Banik <subratabanik@google.com>
Reviewed-by: Paul Menzel <paulepanter@mailbox.org>
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-by: Kapil Porwal <kapilporwal@google.com>
Reviewed-by: Sean Rhodes <sean@starlabs.systems>
This commit is contained in:
Martin Roth 2023-01-10 09:58:46 -07:00 committed by Elyes Haouas
parent 8c3fa461f3
commit f3a672908f
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/device/Kconfig
View File

@ -755,8 +755,14 @@ endif # PCIEXP_HOTPLUG
endif # PCIEXP_PLUGIN_SUPPORT
config DEFAULT_SOFTWARE_CONNECTION_MANAGER
bool
help
select to default to using the Software Connection Manager
choice
prompt "Connection Manager"
default SOFTWARE_CONNECTION_MANAGER if DEFAULT_SOFTWARE_CONNECTION_MANAGER
default FIRMWARE_CONNECTION_MANAGER
help
Software Connection Manager doesn't work with Linux 5.13 or later,

4
src/soc/intel/alderlake/Kconfig
View File

@ -435,8 +435,8 @@ config ACPI_ADL_IPU_ES_SUPPORT
help
Enables ACPI entry to provide silicon type information to IPU kernel driver.
config SOFTWARE_CONNECTION_MANAGER
default y if CHROMEOS
config CHROMEOS
select DEFAULT_SOFTWARE_CONNECTION_MANAGER
config ALDERLAKE_ENABLE_SOC_WORKAROUND
bool

4
src/soc/intel/meteorlake/Kconfig
View File

@ -333,8 +333,8 @@ config MRC_CHANNEL_WIDTH
int
default 16
config SOFTWARE_CONNECTION_MANAGER
default y if CHROMEOS
config CHROMEOS
select DEFAULT_SOFTWARE_CONNECTION_MANAGER
config SOC_INTEL_GFX_FRAMEBUFFER_OFFSET
hex

4
src/soc/intel/tigerlake/Kconfig
View File

@ -295,8 +295,8 @@ config MRC_CHANNEL_WIDTH
int
default 16
config SOFTWARE_CONNECTION_MANAGER
default y if CHROMEOS
config CHROMEOS
select DEFAULT_SOFTWARE_CONNECTION_MANAGER
# Intel recommends reserving the following resources per USB4 root port,
# from TGL BIOS Spec (doc #611569) Revision 0.7.6 Section 7.2.5.1.5