From eff64c675723c740381ebcbe904f513c5cb671c3 Mon Sep 17 00:00:00 2001 From: Jincheng Li Date: Thu, 27 Jun 2024 17:27:13 +0800 Subject: arch/x86: Decouple socket type from SoC type MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I2e15f26436626fbde7a93b47bea9f2601a302ffe Signed-off-by: Jincheng Li Reviewed-on: https://review.coreboot.org/c/coreboot/+/83330 Reviewed-by: Jérémy Compostella Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans --- src/arch/x86/smbios.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/arch/x86/smbios.c b/src/arch/x86/smbios.c index 4fa861249f..97d5f24256 100644 --- a/src/arch/x86/smbios.c +++ b/src/arch/x86/smbios.c @@ -52,16 +52,16 @@ static int get_socket_type(void) return PROCESSOR_UPGRADE_SOCKET_MPGA604; if (CONFIG(CPU_INTEL_SOCKET_LGA775)) return PROCESSOR_UPGRADE_SOCKET_LGA775; - if (CONFIG(SOC_INTEL_ALDERLAKE)) + if (CONFIG(CPU_INTEL_SOCKET_LGA1700)) return PROCESSOR_UPGRADE_SOCKET_LGA1700; - if (CONFIG(SOC_INTEL_METEORLAKE)) - return PROCESSOR_UPGRADE_OTHER; - if (CONFIG(SOC_INTEL_SKYLAKE_SP)) - return PROCESSOR_UPGRADE_SOCKET_LGA3647_1; - if (CONFIG(SOC_INTEL_COOPERLAKE_SP)) + if (CONFIG(CPU_INTEL_SOCKET_LGA4189)) return PROCESSOR_UPGRADE_SOCKET_LGA4189; - if (CONFIG(SOC_INTEL_SAPPHIRERAPIDS_SP)) + if (CONFIG(CPU_INTEL_SOCKET_LGA4677)) return PROCESSOR_UPGRADE_SOCKET_LGA4677; + if (CONFIG(CPU_INTEL_SOCKET_LGA3647_1)) + return PROCESSOR_UPGRADE_SOCKET_LGA3647_1; + if (CONFIG(CPU_INTEL_SOCKET_OTHER)) + return PROCESSOR_UPGRADE_OTHER; return PROCESSOR_UPGRADE_UNKNOWN; } -- cgit v1.2.3