From 2f872e967567815ded97fe61bff3eb2af7935735 Mon Sep 17 00:00:00 2001 From: Elyes Haouas Date: Fri, 21 Jul 2023 07:47:00 +0200 Subject: soc/intel/meteorlake: Remove dummy CPU_SPECIFIC_OPTIONS Change-Id: I0f9299d4b7417efac0d5fba39d40b97d6c3a1926 Signed-off-by: Elyes Haouas Reviewed-on: https://review.coreboot.org/c/coreboot/+/76684 Tested-by: build bot (Jenkins) Reviewed-by: Subrata Banik Reviewed-by: Kapil Porwal --- src/soc/intel/meteorlake/Kconfig | 51 +++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 27 deletions(-) (limited to 'src/soc') diff --git a/src/soc/intel/meteorlake/Kconfig b/src/soc/intel/meteorlake/Kconfig index 29c46df8f4..2eb140584a 100644 --- a/src/soc/intel/meteorlake/Kconfig +++ b/src/soc/intel/meteorlake/Kconfig @@ -1,32 +1,5 @@ config SOC_INTEL_METEORLAKE bool - help - Intel Meteorlake support. Mainboards should specify the SoC - type using the `SOC_INTEL_METEORLAKE_*` options instead - of selecting this option directly. - -config SOC_INTEL_METEORLAKE_U_H - bool - select SOC_INTEL_METEORLAKE - help - Choose this option if your mainboard has a MTL-U (9W or 15W) - or MTL-H (28W or 45W) SoC. - - Note, the MTL-U/H-Processor Line offered in a 1-Chip Platform - that includes the Compute, SOC, GT, and IOE tile on the same - package. - -config SOC_INTEL_METEORLAKE_S - bool - select SOC_INTEL_METEORLAKE - help - Choose this option if your mainboard has a MTL-S (35W or 65W) SoC. - Note, MTL-S SoC combines Compute, GFX, SoC, IOE and PCH die. - -if SOC_INTEL_METEORLAKE - -config CPU_SPECIFIC_OPTIONS - def_bool y select ACPI_INTEL_HARDWARE_SLEEP_VALUES select ARCH_X86 select BOOT_DEVICE_SUPPORTS_WRITES @@ -122,6 +95,30 @@ config CPU_SPECIFIC_OPTIONS select X86_CLFLUSH_CAR select X86_INIT_NEED_1_SIPI select INTEL_KEYLOCKER + help + Intel Meteorlake support. Mainboards should specify the SoC + type using the `SOC_INTEL_METEORLAKE_*` options instead + of selecting this option directly. + +config SOC_INTEL_METEORLAKE_U_H + bool + select SOC_INTEL_METEORLAKE + help + Choose this option if your mainboard has a MTL-U (9W or 15W) + or MTL-H (28W or 45W) SoC. + + Note, the MTL-U/H-Processor Line offered in a 1-Chip Platform + that includes the Compute, SOC, GT, and IOE tile on the same + package. + +config SOC_INTEL_METEORLAKE_S + bool + select SOC_INTEL_METEORLAKE + help + Choose this option if your mainboard has a MTL-S (35W or 65W) SoC. + Note, MTL-S SoC combines Compute, GFX, SoC, IOE and PCH die. + +if SOC_INTEL_METEORLAKE config SOC_INTEL_METEORLAKE_TCSS_USB4_SUPPORT bool -- cgit v1.2.3