From 2e52f0e2438a35f7cffd7ca802a4a0966e02297c Mon Sep 17 00:00:00 2001 From: Elyes Haouas Date: Fri, 21 Jul 2023 07:45:54 +0200 Subject: soc/intel/skylake: Remove dummy CPU_SPECIFIC_OPTIONS Change-Id: Iea0e55c6c55635976dad0422470f3927bdc26e35 Signed-off-by: Elyes Haouas Reviewed-on: https://review.coreboot.org/c/coreboot/+/76683 Tested-by: build bot (Jenkins) Reviewed-by: Martin L Roth --- src/soc/intel/skylake/Kconfig | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig index e15af04b65..d6a11363ee 100644 --- a/src/soc/intel/skylake/Kconfig +++ b/src/soc/intel/skylake/Kconfig @@ -1,26 +1,5 @@ config SOC_INTEL_COMMON_SKYLAKE_BASE bool - -config SOC_INTEL_SKYLAKE - bool - select SOC_INTEL_COMMON_SKYLAKE_BASE - -config SOC_INTEL_KABYLAKE - bool - select SOC_INTEL_COMMON_SKYLAKE_BASE - -config SOC_INTEL_SKYLAKE_LGA1151_V2 - bool - select PLATFORM_USES_FSP2_1 - select SOC_INTEL_COMMON_SKYLAKE_BASE - select SKYLAKE_SOC_PCH_H - help - Selected by mainboards with a LGA1151 v2 socket and a Z370, H310C or B365 PCH - -if SOC_INTEL_COMMON_SKYLAKE_BASE - -config CPU_SPECIFIC_OPTIONS - def_bool y select ACPI_INTEL_HARDWARE_SLEEP_VALUES select ACPI_NHLT select ARCH_X86 @@ -92,6 +71,24 @@ config CPU_SPECIFIC_OPTIONS select USE_FSP_NOTIFY_PHASE_READY_TO_BOOT select USE_FSP_NOTIFY_PHASE_END_OF_FIRMWARE +config SOC_INTEL_SKYLAKE + bool + select SOC_INTEL_COMMON_SKYLAKE_BASE + +config SOC_INTEL_KABYLAKE + bool + select SOC_INTEL_COMMON_SKYLAKE_BASE + +config SOC_INTEL_SKYLAKE_LGA1151_V2 + bool + select PLATFORM_USES_FSP2_1 + select SOC_INTEL_COMMON_SKYLAKE_BASE + select SKYLAKE_SOC_PCH_H + help + Selected by mainboards with a LGA1151 v2 socket and a Z370, H310C or B365 PCH + +if SOC_INTEL_COMMON_SKYLAKE_BASE + config MAX_HECI_DEVICES int default 5 -- cgit v1.2.3