diff options
| author | Martin Roth <martin.roth@amd.com> | 2023-01-10 09:58:46 -0700 |
|---|---|---|
| committer | Elyes Haouas <ehaouas@noos.fr> | 2023-01-11 16:53:59 +0000 |
| commit | f3a672908fd27dcf48e24d939dbe8f072843e1e0 (patch) | |
| tree | 6916f59195d811edb06ca86373fcab93f60b4924 | |
| parent | 8c3fa461f331485f37279ec9207b21b8b29938bd (diff) | |
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>
| -rw-r--r-- | src/device/Kconfig | 6 | ||||
| -rw-r--r-- | src/soc/intel/alderlake/Kconfig | 4 | ||||
| -rw-r--r-- | src/soc/intel/meteorlake/Kconfig | 4 | ||||
| -rw-r--r-- | src/soc/intel/tigerlake/Kconfig | 4 |
4 files changed, 12 insertions, 6 deletions
diff --git a/src/device/Kconfig b/src/device/Kconfig index e98644e34d..fdedf46100 100644 --- a/src/device/Kconfig +++ b/src/device/Kconfig @@ -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, diff --git a/src/soc/intel/alderlake/Kconfig b/src/soc/intel/alderlake/Kconfig index a5332b06c6..d4c4be8a29 100644 --- a/src/soc/intel/alderlake/Kconfig +++ b/src/soc/intel/alderlake/Kconfig @@ -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 diff --git a/src/soc/intel/meteorlake/Kconfig b/src/soc/intel/meteorlake/Kconfig index ce56e6b8d0..b84cc552b8 100644 --- a/src/soc/intel/meteorlake/Kconfig +++ b/src/soc/intel/meteorlake/Kconfig @@ -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 diff --git a/src/soc/intel/tigerlake/Kconfig b/src/soc/intel/tigerlake/Kconfig index 288bb39462..0e7bb64a80 100644 --- a/src/soc/intel/tigerlake/Kconfig +++ b/src/soc/intel/tigerlake/Kconfig @@ -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 |