summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/device/Kconfig6
-rw-r--r--src/soc/intel/alderlake/Kconfig4
-rw-r--r--src/soc/intel/meteorlake/Kconfig4
-rw-r--r--src/soc/intel/tigerlake/Kconfig4
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