From 6e4f4538bbdb7dcddd2195df22a3f9ee2f64a6a8 Mon Sep 17 00:00:00 2001 From: Sean Rhodes Date: Fri, 18 Jul 2025 13:43:58 +0100 Subject: [PATCH] soc/intel/{tgl,adl,mtl,ptl}: Default to Software Connection Manager Commit 060df17f1d17 ("soc/intel/alderlake/acpi: Add Kconfig options for SCM and FCM") set the default to Firmware Connection Manager, as linux commit c6da62a219d028de10f2e22e93a34c7ee2b88d03 did not work correctly with Software Connection Manager. This issue was fixed with linux commit 719e1f561afbe020ed175825a9bd25ed62ed1697, so now that Software Connection Manager works, default to it for normal builds as well as ChromeOS ones. Change-Id: I4393fc4992d602b7214929592f542270002d84ec Signed-off-by: Sean Rhodes Reviewed-on: https://review.coreboot.org/c/coreboot/+/88484 Tested-by: build bot (Jenkins) Reviewed-by: Subrata Banik --- src/soc/intel/alderlake/Kconfig | 2 +- src/soc/intel/meteorlake/Kconfig | 2 +- src/soc/intel/pantherlake/Kconfig | 2 +- src/soc/intel/tigerlake/Kconfig | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/soc/intel/alderlake/Kconfig b/src/soc/intel/alderlake/Kconfig index fc94695f18..51bdf98b9d 100644 --- a/src/soc/intel/alderlake/Kconfig +++ b/src/soc/intel/alderlake/Kconfig @@ -10,7 +10,7 @@ config SOC_INTEL_ALDERLAKE 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_SOFTWARE_CONNECTION_MANAGER select DISPLAY_FSP_VERSION_INFO select DRIVERS_USB_ACPI select EDK2_CPU_TIMER_LIB if PAYLOAD_EDK2 diff --git a/src/soc/intel/meteorlake/Kconfig b/src/soc/intel/meteorlake/Kconfig index 050ddfcd3f..b9dc579c44 100644 --- a/src/soc/intel/meteorlake/Kconfig +++ b/src/soc/intel/meteorlake/Kconfig @@ -11,7 +11,7 @@ config SOC_INTEL_METEORLAKE 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_SOFTWARE_CONNECTION_MANAGER select DEFAULT_X2APIC_LATE_WORKAROUND select DISPLAY_FSP_VERSION_INFO_2 if !FSP_USE_REPO select DRIVERS_USB_ACPI diff --git a/src/soc/intel/pantherlake/Kconfig b/src/soc/intel/pantherlake/Kconfig index 439cdc75f9..9f4e748f74 100644 --- a/src/soc/intel/pantherlake/Kconfig +++ b/src/soc/intel/pantherlake/Kconfig @@ -11,7 +11,7 @@ config SOC_INTEL_PANTHERLAKE_BASE 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_SOFTWARE_CONNECTION_MANAGER select DEFAULT_X2APIC_LATE_WORKAROUND select POSTPONE_SPI_ACCESS select DISPLAY_FSP_VERSION_INFO_2 diff --git a/src/soc/intel/tigerlake/Kconfig b/src/soc/intel/tigerlake/Kconfig index 1b04fbc0c8..833684f0a6 100644 --- a/src/soc/intel/tigerlake/Kconfig +++ b/src/soc/intel/tigerlake/Kconfig @@ -10,7 +10,7 @@ config SOC_INTEL_TIGERLAKE 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_SOFTWARE_CONNECTION_MANAGER select DISPLAY_FSP_VERSION_INFO if !FSP_TYPE_IOT select DRIVERS_USB_ACPI select EDK2_CPU_TIMER_LIB if PAYLOAD_EDK2