Arthur Heymans submitted this change.

View Change

Approvals:
  build bot (Jenkins): Verified
  Felix Singer: Looks good to me, approved
  Nico Huber: Looks good to me, but someone else must approve

device/Kconfig: Move Intel/ACPI/USB4 specific Kconfig options

This options should not be visible on !Intel, !ACPI and !USB4.

Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Change-Id: Ia515d52baead9e151533278c33fda9436ee56168
Reviewed-on: https://review.coreboot.org/c/coreboot/+/79669
Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
M src/device/Kconfig
M src/soc/intel/common/block/usb4/Kconfig
2 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/src/device/Kconfig b/src/device/Kconfig
index e5b90bb..404c73d 100644
--- a/src/device/Kconfig
+++ b/src/device/Kconfig
@@ -773,36 +773,6 @@
 
 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,
-	  resulting in TBT ports timing out. Firmware Connection Manager works
-	  correctly.
-
-	  Linux patch:
-	    torvalds/linux@c6da62a
-	    c6da62a219d028de10f2e22e93a34c7ee2b88d03
-
-config FIRMWARE_CONNECTION_MANAGER
-	bool "Firmware Connection Manager"
-	help
-	  Disable SCM so that FCM can be used
-
-config SOFTWARE_CONNECTION_MANAGER
-	bool "Software Connection Manager"
-	help
-	  Enable SCM so it's used instead of FCM.
-
-endchoice
-
 config EARLY_PCI_BRIDGE
 	bool "Early PCI bridge"
 	depends on PCI
diff --git a/src/soc/intel/common/block/usb4/Kconfig b/src/soc/intel/common/block/usb4/Kconfig
index 05337be..234428a 100644
--- a/src/soc/intel/common/block/usb4/Kconfig
+++ b/src/soc/intel/common/block/usb4/Kconfig
@@ -27,3 +27,32 @@
 	select PCIEXP_HOTPLUG
 	help
 	  Enable USB4 PCIe resources for reserving hotplug buses and memory.
+
+config DEFAULT_SOFTWARE_CONNECTION_MANAGER
+	bool
+	help
+	  select to default to using the Software Connection Manager
+
+choice
+	prompt "Connection Manager"
+	depends on SOC_INTEL_COMMON_BLOCK_USB4
+	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,
+	  resulting in TBT ports timing out. Firmware Connection Manager works
+	  correctly.
+	  Linux patch:
+	    torvalds/linux@c6da62a
+	    c6da62a219d028de10f2e22e93a34c7ee2b88d03
+
+config FIRMWARE_CONNECTION_MANAGER
+	bool "Firmware Connection Manager"
+	help
+	  Disable SCM so that FCM can be used
+
+config SOFTWARE_CONNECTION_MANAGER
+	bool "Software Connection Manager"
+	help
+	  Enable SCM so it's used instead of FCM.
+endchoice

To view, visit change 79669. To unsubscribe, or for help writing mail filters, visit settings.