3 files changed, 3 insertions, 9 deletions
diff --git a/src/soc/intel/alderlake/Kconfig b/src/soc/intel/alderlake/Kconfig
index 0561d747f2..a200121509 100644
--- a/src/soc/intel/alderlake/Kconfig
+++ b/src/soc/intel/alderlake/Kconfig
@@ -54,6 +54,7 @@ config CPU_SPECIFIC_OPTIONS
 	select CPU_INTEL_FIRMWARE_INTERFACE_TABLE
 	select CPU_SUPPORTS_INTEL_TME
 	select CPU_SUPPORTS_PM_TIMER_EMULATION
+	select DEFAULT_SOFTWARE_CONNECTION_MANAGER if MAINBOARD_HAS_CHROMEOS
 	select DISPLAY_FSP_VERSION_INFO
 	select DRIVERS_USB_ACPI
 	select EDK2_CPU_TIMER_LIB if PAYLOAD_EDK2
@@ -438,9 +439,6 @@ config ACPI_ADL_IPU_ES_SUPPORT
 	help
 	  Enables ACPI entry to provide silicon type information to IPU kernel driver.
 
-config CHROMEOS
-	select DEFAULT_SOFTWARE_CONNECTION_MANAGER
-
 config ALDERLAKE_ENABLE_SOC_WORKAROUND
 	bool
 	default y
diff --git a/src/soc/intel/meteorlake/Kconfig b/src/soc/intel/meteorlake/Kconfig
index 8b3a553007..c00be8fe20 100644
--- a/src/soc/intel/meteorlake/Kconfig
+++ b/src/soc/intel/meteorlake/Kconfig
@@ -16,6 +16,7 @@ config CPU_SPECIFIC_OPTIONS
 	select CPU_INTEL_FIRMWARE_INTERFACE_TABLE
 	select CPU_SUPPORTS_INTEL_TME
 	select CPU_SUPPORTS_PM_TIMER_EMULATION
+	select DEFAULT_SOFTWARE_CONNECTION_MANAGER if MAINBOARD_HAS_CHROMEOS
 	select DEFAULT_X2APIC_LATE_WORKAROUND
 	select DISPLAY_FSP_VERSION_INFO_2
 	select DRIVERS_USB_ACPI
@@ -339,9 +340,6 @@ config MRC_CHANNEL_WIDTH
 	int
 	default 16
 
-config CHROMEOS
-	select DEFAULT_SOFTWARE_CONNECTION_MANAGER
-
 config SOC_INTEL_GFX_FRAMEBUFFER_OFFSET
 	hex
 	default 0x800000
diff --git a/src/soc/intel/tigerlake/Kconfig b/src/soc/intel/tigerlake/Kconfig
index 0e7bb64a80..915145085b 100644
--- a/src/soc/intel/tigerlake/Kconfig
+++ b/src/soc/intel/tigerlake/Kconfig
@@ -18,6 +18,7 @@ config CPU_SPECIFIC_OPTIONS
 	select CPU_INTEL_FIRMWARE_INTERFACE_TABLE
 	select CPU_SUPPORTS_INTEL_TME
 	select CPU_SUPPORTS_PM_TIMER_EMULATION
+	select DEFAULT_SOFTWARE_CONNECTION_MANAGER if MAINBOARD_HAS_CHROMEOS
 	select DISPLAY_FSP_VERSION_INFO if !FSP_TYPE_IOT
 	select DRIVERS_USB_ACPI
 	select EDK2_CPU_TIMER_LIB if PAYLOAD_EDK2
@@ -295,9 +296,6 @@ config MRC_CHANNEL_WIDTH
 	int
 	default 16
 
-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
 # - 42 buses