From 04340496c121894af0155311c223eed2d5e6597e Mon Sep 17 00:00:00 2001 From: Jincheng Li Date: Thu, 27 Jun 2024 17:22:38 +0800 Subject: [PATCH] cpu/intel: Add socket types MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Add socket types for LGA1700, LGA3647_1, LGA4189, LGA4677. Select the socket type for different boards. For the socket types which are not defined in SMBIOS type4, CPU_INTEL_SOCKET_OTHER could be used. Change-Id: Ida3315694f3ce397b9ad9d676d3195da5f096cb7 Signed-off-by: Jincheng Li Reviewed-on: https://review.coreboot.org/c/coreboot/+/83329 Reviewed-by: Jérémy Compostella Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans --- src/cpu/intel/Kconfig | 5 +++++ src/cpu/intel/Makefile.mk | 5 +++++ src/cpu/intel/socket_LGA1700/Kconfig | 2 ++ src/cpu/intel/socket_LGA3647_1/Kconfig | 2 ++ src/cpu/intel/socket_LGA4189/Kconfig | 2 ++ src/cpu/intel/socket_LGA4677/Kconfig | 2 ++ src/cpu/intel/socket_OTHER/Kconfig | 2 ++ src/mainboard/intel/adlrvp/Kconfig | 1 + src/mainboard/intel/archercity_crb/Kconfig | 1 + src/mainboard/intel/cedarisland_crb/Kconfig | 1 + src/mainboard/intel/mtlrvp/Kconfig | 1 + src/mainboard/ocp/tiogapass/Kconfig | 1 + 12 files changed, 25 insertions(+) create mode 100644 src/cpu/intel/socket_LGA1700/Kconfig create mode 100644 src/cpu/intel/socket_LGA3647_1/Kconfig create mode 100644 src/cpu/intel/socket_LGA4189/Kconfig create mode 100644 src/cpu/intel/socket_LGA4677/Kconfig create mode 100644 src/cpu/intel/socket_OTHER/Kconfig diff --git a/src/cpu/intel/Kconfig b/src/cpu/intel/Kconfig index 0bbaf02182..f28bbdbb03 100644 --- a/src/cpu/intel/Kconfig +++ b/src/cpu/intel/Kconfig @@ -25,6 +25,11 @@ source "src/cpu/intel/socket_p/Kconfig" source "src/cpu/intel/socket_mPGA604/Kconfig" source "src/cpu/intel/socket_441/Kconfig" source "src/cpu/intel/socket_LGA775/Kconfig" +source "src/cpu/intel/socket_LGA1700/Kconfig" +source "src/cpu/intel/socket_LGA3647_1/Kconfig" +source "src/cpu/intel/socket_LGA4189/Kconfig" +source "src/cpu/intel/socket_LGA4677/Kconfig" +source "src/cpu/intel/socket_OTHER/Kconfig" # Architecture specific features source "src/cpu/intel/fit/Kconfig" source "src/cpu/intel/turbo/Kconfig" diff --git a/src/cpu/intel/Makefile.mk b/src/cpu/intel/Makefile.mk index bc8f5375c1..77b4618663 100644 --- a/src/cpu/intel/Makefile.mk +++ b/src/cpu/intel/Makefile.mk @@ -17,5 +17,10 @@ subdirs-$(CONFIG_CPU_INTEL_MODEL_206AX) += model_206ax subdirs-$(CONFIG_CPU_INTEL_HASWELL) += haswell subdirs-$(CONFIG_CPU_INTEL_SLOT_1) += slot_1 subdirs-$(CONFIG_CPU_INTEL_SOCKET_LGA775) += socket_LGA775 +subdirs-$(CONFIG_CPU_INTEL_SOCKET_LGA1700) += socket_LGA1700 +subdirs-$(CONFIG_CPU_INTEL_SOCKET_LGA3647_1) += socket_LGA3647_1 +subdirs-$(CONFIG_CPU_INTEL_SOCKET_LGA4189) += socket_LGA4189 +subdirs-$(CONFIG_CPU_INTEL_SOCKET_LGA4677) += socket_LGA4677 +subdirs-$(CONFIG_CPU_INTEL_SOCKET_OTHER) += socket_OTHER subdirs-y += common diff --git a/src/cpu/intel/socket_LGA1700/Kconfig b/src/cpu/intel/socket_LGA1700/Kconfig new file mode 100644 index 0000000000..7597a7467f --- /dev/null +++ b/src/cpu/intel/socket_LGA1700/Kconfig @@ -0,0 +1,2 @@ +config CPU_INTEL_SOCKET_LGA1700 + bool diff --git a/src/cpu/intel/socket_LGA3647_1/Kconfig b/src/cpu/intel/socket_LGA3647_1/Kconfig new file mode 100644 index 0000000000..a4d3e59653 --- /dev/null +++ b/src/cpu/intel/socket_LGA3647_1/Kconfig @@ -0,0 +1,2 @@ +config CPU_INTEL_SOCKET_LGA3647_1 + bool diff --git a/src/cpu/intel/socket_LGA4189/Kconfig b/src/cpu/intel/socket_LGA4189/Kconfig new file mode 100644 index 0000000000..39b8be4690 --- /dev/null +++ b/src/cpu/intel/socket_LGA4189/Kconfig @@ -0,0 +1,2 @@ +config CPU_INTEL_SOCKET_LGA4189 + bool diff --git a/src/cpu/intel/socket_LGA4677/Kconfig b/src/cpu/intel/socket_LGA4677/Kconfig new file mode 100644 index 0000000000..321a0abf29 --- /dev/null +++ b/src/cpu/intel/socket_LGA4677/Kconfig @@ -0,0 +1,2 @@ +config CPU_INTEL_SOCKET_LGA4677 + bool diff --git a/src/cpu/intel/socket_OTHER/Kconfig b/src/cpu/intel/socket_OTHER/Kconfig new file mode 100644 index 0000000000..b544af1436 --- /dev/null +++ b/src/cpu/intel/socket_OTHER/Kconfig @@ -0,0 +1,2 @@ +config CPU_INTEL_SOCKET_OTHER + bool diff --git a/src/mainboard/intel/adlrvp/Kconfig b/src/mainboard/intel/adlrvp/Kconfig index 5ee091bc8b..0171ebc9a9 100644 --- a/src/mainboard/intel/adlrvp/Kconfig +++ b/src/mainboard/intel/adlrvp/Kconfig @@ -3,6 +3,7 @@ config BOARD_INTEL_ADLRVP_COMMON def_bool n select BOARD_ROMSIZE_KB_32768 + select CPU_INTEL_SOCKET_LGA1700 select DRIVERS_I2C_GENERIC select DRIVERS_I2C_HID select DRIVERS_I2C_MAX98373 diff --git a/src/mainboard/intel/archercity_crb/Kconfig b/src/mainboard/intel/archercity_crb/Kconfig index 200fa49eca..4d864d143f 100644 --- a/src/mainboard/intel/archercity_crb/Kconfig +++ b/src/mainboard/intel/archercity_crb/Kconfig @@ -5,6 +5,7 @@ if BOARD_INTEL_ARCHERCITY_CRB config BOARD_SPECIFIC_OPTIONS def_bool y select BOARD_ROMSIZE_KB_65536 + select CPU_INTEL_SOCKET_LGA4677 select CONSOLE_OVERRIDE_LOGLEVEL select IPMI_KCS select IPMI_KCS_ROMSTAGE diff --git a/src/mainboard/intel/cedarisland_crb/Kconfig b/src/mainboard/intel/cedarisland_crb/Kconfig index 4e3a1ccea5..8006667d62 100644 --- a/src/mainboard/intel/cedarisland_crb/Kconfig +++ b/src/mainboard/intel/cedarisland_crb/Kconfig @@ -5,6 +5,7 @@ if BOARD_INTEL_CEDARISLAND_CRB config BOARD_SPECIFIC_OPTIONS def_bool y select BOARD_ROMSIZE_KB_65536 + select CPU_INTEL_SOCKET_LGA4189 select SOC_INTEL_COOPERLAKE_SP select SUPERIO_ASPEED_AST2400 select HAVE_ACPI_TABLES diff --git a/src/mainboard/intel/mtlrvp/Kconfig b/src/mainboard/intel/mtlrvp/Kconfig index bbff4aa7c5..84ebade105 100644 --- a/src/mainboard/intel/mtlrvp/Kconfig +++ b/src/mainboard/intel/mtlrvp/Kconfig @@ -3,6 +3,7 @@ config BOARD_INTEL_MTLRVP_COMMON def_bool n select BOARD_ROMSIZE_KB_32768 + select CPU_INTEL_SOCKET_OTHER select DRIVERS_GENERIC_MAX98357A select DRIVERS_I2C_GENERIC select DRIVERS_I2C_HID diff --git a/src/mainboard/ocp/tiogapass/Kconfig b/src/mainboard/ocp/tiogapass/Kconfig index cbfb5c8c7b..f20940f9b0 100644 --- a/src/mainboard/ocp/tiogapass/Kconfig +++ b/src/mainboard/ocp/tiogapass/Kconfig @@ -5,6 +5,7 @@ if BOARD_OCP_TIOGAPASS config BOARD_SPECIFIC_OPTIONS def_bool y select BOARD_ROMSIZE_KB_32768 + select CPU_INTEL_SOCKET_LGA3647_1 select HAVE_ACPI_TABLES select IPMI_KCS select IPMI_KCS_ROMSTAGE -- 2.11.4.GIT