Elyes Haouas has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/71701 )
Change subject: soc/intel: Remove dummy _SPECIFIC_OPTIONS ......................................................................
soc/intel: Remove dummy _SPECIFIC_OPTIONS
Change-Id: I7cfdc477e8aec53bdfcfd4498e2dea83a7696dd0 Signed-off-by: Elyes Haouas ehaouas@noos.fr --- M src/soc/intel/alderlake/Kconfig M src/soc/intel/apollolake/Kconfig M src/soc/intel/baytrail/Kconfig M src/soc/intel/braswell/Kconfig M src/soc/intel/broadwell/Kconfig M src/soc/intel/broadwell/pch/Kconfig M src/soc/intel/cannonlake/Kconfig M src/soc/intel/denverton_ns/Kconfig M src/soc/intel/elkhartlake/Kconfig M src/soc/intel/icelake/Kconfig M src/soc/intel/jasperlake/Kconfig M src/soc/intel/meteorlake/Kconfig M src/soc/intel/quark/Kconfig M src/soc/intel/skylake/Kconfig M src/soc/intel/tigerlake/Kconfig M src/soc/intel/xeon_sp/Kconfig M src/soc/intel/xeon_sp/cpx/Kconfig 17 files changed, 206 insertions(+), 242 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/01/71701/1
diff --git a/src/soc/intel/alderlake/Kconfig b/src/soc/intel/alderlake/Kconfig index 9d950a7..b7f32f0 100644 --- a/src/soc/intel/alderlake/Kconfig +++ b/src/soc/intel/alderlake/Kconfig @@ -1,50 +1,5 @@ config SOC_INTEL_ALDERLAKE bool - help - Intel Alderlake support. Mainboards should specify the PCH - type using the `SOC_INTEL_ALDERLAKE_PCH_*` options instead - of selecting this option directly. - -config SOC_INTEL_RAPTORLAKE - bool - select X86_INIT_NEED_1_SIPI - help - Intel Raptorlake support. Mainboards using RPL should select - SOC_INTEL_RAPTORLAKE and SOC_INTEL_ALDERLAKE_PCH_* together. - -config SOC_INTEL_ALDERLAKE_PCH_M - bool - select SOC_INTEL_ALDERLAKE - help - Choose this option if your mainboard has a PCH-M chipset. - -config SOC_INTEL_ALDERLAKE_PCH_N - bool - select SOC_INTEL_ALDERLAKE - select MICROCODE_BLOB_UNDISCLOSED - help - Choose this option if your mainboard has a PCH-N chipset. - -config SOC_INTEL_ALDERLAKE_PCH_P - bool - select SOC_INTEL_ALDERLAKE - select HAVE_INTEL_FSP_REPO - select PLATFORM_USES_FSP2_3 - help - Choose this option if your mainboard has a PCH-P chipset. - -config SOC_INTEL_ALDERLAKE_PCH_S - bool - select SOC_INTEL_ALDERLAKE - select HAVE_INTEL_FSP_REPO - select PLATFORM_USES_FSP2_3 - help - Choose this option if your mainboard has a PCH-S chipset. - -if SOC_INTEL_ALDERLAKE - -config CPU_SPECIFIC_OPTIONS - def_bool y select ACPI_INTEL_HARDWARE_SLEEP_VALUES select ACPI_ADL_IPU_ES_SUPPORT select ARCH_X86 @@ -127,6 +82,48 @@ select UDELAY_TSC select UDK_202005_BINDING select VBOOT_LIB + help + Intel Alderlake support. Mainboards should specify the PCH + type using the `SOC_INTEL_ALDERLAKE_PCH_*` options instead + of selecting this option directly. + +config SOC_INTEL_RAPTORLAKE + bool + select X86_INIT_NEED_1_SIPI + help + Intel Raptorlake support. Mainboards using RPL should select + SOC_INTEL_RAPTORLAKE and SOC_INTEL_ALDERLAKE_PCH_* together. + +config SOC_INTEL_ALDERLAKE_PCH_M + bool + select SOC_INTEL_ALDERLAKE + help + Choose this option if your mainboard has a PCH-M chipset. + +config SOC_INTEL_ALDERLAKE_PCH_N + bool + select SOC_INTEL_ALDERLAKE + select MICROCODE_BLOB_UNDISCLOSED + help + Choose this option if your mainboard has a PCH-N chipset. + +config SOC_INTEL_ALDERLAKE_PCH_P + bool + select SOC_INTEL_ALDERLAKE + select HAVE_INTEL_FSP_REPO + select PLATFORM_USES_FSP2_3 + help + Choose this option if your mainboard has a PCH-P chipset. + +config SOC_INTEL_ALDERLAKE_PCH_S + bool + select SOC_INTEL_ALDERLAKE + select HAVE_INTEL_FSP_REPO + select PLATFORM_USES_FSP2_3 + help + Choose this option if your mainboard has a PCH-S chipset. + +if SOC_INTEL_ALDERLAKE
config SOC_INTEL_ALDERLAKE_TCSS_USB4_SUPPORT bool diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig index 395d7aa6..39d1a8e 100644 --- a/src/soc/intel/apollolake/Kconfig +++ b/src/soc/intel/apollolake/Kconfig @@ -1,27 +1,6 @@ config SOC_INTEL_APOLLOLAKE bool select INTEL_CAR_CQOS - help - Intel Apollolake support - -config SOC_INTEL_GEMINILAKE - bool - default n - select SOC_INTEL_APOLLOLAKE - select SOC_INTEL_COMMON_BLOCK_CNVI - select SOC_INTEL_COMMON_BLOCK_CPU_MPINIT - select SOC_INTEL_COMMON_BLOCK_SGX - select SOC_INTEL_COMMON_BLOCK_GSPI_VERSION_2 - select IDT_IN_EVERY_STAGE - select PAGING_IN_CACHE_AS_RAM - select INTEL_CAR_NEM - help - Intel GLK support - -if SOC_INTEL_APOLLOLAKE - -config CPU_SPECIFIC_OPTIONS - def_bool y select ACPI_INTEL_HARDWARE_SLEEP_VALUES select ACPI_NO_PCAT_8259 select ARCH_X86 @@ -101,6 +80,24 @@ # This SoC does not map SPI flash like many previous SoC. Therefore we # provide a custom media driver that facilitates mapping select X86_CUSTOM_BOOTMEDIA + help + Intel Apollolake support + +config SOC_INTEL_GEMINILAKE + bool + default n + select SOC_INTEL_APOLLOLAKE + select SOC_INTEL_COMMON_BLOCK_CNVI + select SOC_INTEL_COMMON_BLOCK_CPU_MPINIT + select SOC_INTEL_COMMON_BLOCK_SGX + select SOC_INTEL_COMMON_BLOCK_GSPI_VERSION_2 + select IDT_IN_EVERY_STAGE + select PAGING_IN_CACHE_AS_RAM + select INTEL_CAR_NEM + help + Intel GLK support + +if SOC_INTEL_APOLLOLAKE
config SKIP_CSE_RBP bool diff --git a/src/soc/intel/baytrail/Kconfig b/src/soc/intel/baytrail/Kconfig index 5ecfe3e..50b83bf 100644 --- a/src/soc/intel/baytrail/Kconfig +++ b/src/soc/intel/baytrail/Kconfig @@ -1,12 +1,5 @@ config SOC_INTEL_BAYTRAIL bool - help - Bay Trail M/D part support. - -if SOC_INTEL_BAYTRAIL - -config CPU_SPECIFIC_OPTIONS - def_bool y select ACPI_INTEL_HARDWARE_SLEEP_VALUES select ARCH_X86 select BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES @@ -35,6 +28,10 @@ select CPU_INTEL_COMMON select CPU_HAS_L2_ENABLE_MSR select TCO_SPACE_NOT_YET_SPLIT + help + Bay Trail M/D part support. + +if SOC_INTEL_BAYTRAIL
config VBOOT select VBOOT_MUST_REQUEST_DISPLAY diff --git a/src/soc/intel/braswell/Kconfig b/src/soc/intel/braswell/Kconfig index 4d3d4df..4a209f6 100644 --- a/src/soc/intel/braswell/Kconfig +++ b/src/soc/intel/braswell/Kconfig @@ -1,12 +1,5 @@ config SOC_INTEL_BRASWELL bool - help - Braswell M/D part support. - -if SOC_INTEL_BRASWELL - -config CPU_SPECIFIC_OPTIONS - def_bool y select ACPI_INTEL_HARDWARE_SLEEP_VALUES select ARCH_X86 select BOOT_DEVICE_SUPPORTS_WRITES @@ -42,6 +35,10 @@ select SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT select NO_CBFS_MCACHE select TCO_SPACE_NOT_YET_SPLIT + help + Braswell M/D part support. + +if SOC_INTEL_BRASWELL
config DCACHE_BSP_STACK_SIZE hex diff --git a/src/soc/intel/broadwell/Kconfig b/src/soc/intel/broadwell/Kconfig index 3878f14..e5784c5 100644 --- a/src/soc/intel/broadwell/Kconfig +++ b/src/soc/intel/broadwell/Kconfig @@ -1,18 +1,15 @@ config SOC_INTEL_BROADWELL bool - help - Intel Broadwell and Haswell ULT support. - -if SOC_INTEL_BROADWELL - -config SOC_SPECIFIC_OPTIONS - def_bool y select CACHE_MRC_SETTINGS select CPU_INTEL_HASWELL select INTEL_GMA_ACPI select MRC_SETTINGS_PROTECT select REG_SCRIPT select TCO_SPACE_NOT_YET_SPLIT + help + Intel Broadwell and Haswell ULT support. + +if SOC_INTEL_BROADWELL
config BROADWELL_LPDDR3 bool diff --git a/src/soc/intel/broadwell/pch/Kconfig b/src/soc/intel/broadwell/pch/Kconfig index 5a80d32..9674edf 100644 --- a/src/soc/intel/broadwell/pch/Kconfig +++ b/src/soc/intel/broadwell/pch/Kconfig @@ -1,9 +1,6 @@ config INTEL_LYNXPOINT_LP bool default y if SOC_INTEL_BROADWELL - -config PCH_SPECIFIC_OPTIONS - def_bool y select ACPI_INTEL_HARDWARE_SLEEP_VALUES select ACPI_SOC_NVS select AZALIA_PLUGIN_SUPPORT @@ -25,6 +22,8 @@ select SPI_FLASH select TCO_SPACE_NOT_YET_SPLIT
+if INTEL_LYNXPOINT_LP + config EHCI_BAR hex default 0xd8000000 @@ -74,3 +73,5 @@ Disable and hide the ME PCI interface during finalize stage of boot. This will prevent the OS (and userspace apps) from interacting with the ME via the PCI interface after boot. + +endif diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig index 16a3cbd..9a4d5dc 100644 --- a/src/soc/intel/cannonlake/Kconfig +++ b/src/soc/intel/cannonlake/Kconfig @@ -1,56 +1,5 @@ config SOC_INTEL_CANNONLAKE_BASE bool - -config SOC_INTEL_COFFEELAKE - bool - select SOC_INTEL_CANNONLAKE_BASE - select FSP_USES_CB_STACK - select HAVE_EXP_X86_64_SUPPORT - select HAVE_INTEL_FSP_REPO - select HECI_DISABLE_USING_SMM - select SOC_INTEL_CONFIGURE_DDI_A_4_LANES - -config SOC_INTEL_WHISKEYLAKE - bool - select SOC_INTEL_CANNONLAKE_BASE - select FSP_USES_CB_STACK - select HAVE_INTEL_FSP_REPO - select HECI_DISABLE_USING_SMM - select SOC_INTEL_CONFIGURE_DDI_A_4_LANES - -config SOC_INTEL_COMETLAKE - bool - select SOC_INTEL_CANNONLAKE_BASE - select FSP_USES_CB_STACK - select HAVE_INTEL_FSP_REPO - select PMC_IPC_ACPI_INTERFACE if DISABLE_HECI1_AT_PRE_BOOT - select SOC_INTEL_CONFIGURE_DDI_A_4_LANES - select SOC_INTEL_COMMON_BLOCK_HECI1_DISABLE_USING_PMC_IPC - select SOC_INTEL_COMMON_BASECODE if SOC_INTEL_CSE_LITE_SKU - -config SOC_INTEL_COMETLAKE_1 - bool - select SOC_INTEL_COMETLAKE - -config SOC_INTEL_COMETLAKE_2 - bool - select SOC_INTEL_COMETLAKE - -config SOC_INTEL_COMETLAKE_S - bool - select SOC_INTEL_COMETLAKE - -config SOC_INTEL_COMETLAKE_V - bool - select SOC_INTEL_COMETLAKE - -config SOC_INTEL_CANNONLAKE_PCH_H - bool - -if SOC_INTEL_CANNONLAKE_BASE - -config CPU_SPECIFIC_OPTIONS - def_bool y select ACPI_INTEL_HARDWARE_SLEEP_VALUES select ACPI_NHLT select ARCH_X86 @@ -119,6 +68,54 @@ select USE_FSP_NOTIFY_PHASE_READY_TO_BOOT select USE_FSP_NOTIFY_PHASE_END_OF_FIRMWARE
+config SOC_INTEL_COFFEELAKE + bool + select SOC_INTEL_CANNONLAKE_BASE + select FSP_USES_CB_STACK + select HAVE_EXP_X86_64_SUPPORT + select HAVE_INTEL_FSP_REPO + select HECI_DISABLE_USING_SMM + select SOC_INTEL_CONFIGURE_DDI_A_4_LANES + +config SOC_INTEL_WHISKEYLAKE + bool + select SOC_INTEL_CANNONLAKE_BASE + select FSP_USES_CB_STACK + select HAVE_INTEL_FSP_REPO + select HECI_DISABLE_USING_SMM + select SOC_INTEL_CONFIGURE_DDI_A_4_LANES + +config SOC_INTEL_COMETLAKE + bool + select SOC_INTEL_CANNONLAKE_BASE + select FSP_USES_CB_STACK + select HAVE_INTEL_FSP_REPO + select PMC_IPC_ACPI_INTERFACE if DISABLE_HECI1_AT_PRE_BOOT + select SOC_INTEL_CONFIGURE_DDI_A_4_LANES + select SOC_INTEL_COMMON_BLOCK_HECI1_DISABLE_USING_PMC_IPC + select SOC_INTEL_COMMON_BASECODE if SOC_INTEL_CSE_LITE_SKU + +config SOC_INTEL_COMETLAKE_1 + bool + select SOC_INTEL_COMETLAKE + +config SOC_INTEL_COMETLAKE_2 + bool + select SOC_INTEL_COMETLAKE + +config SOC_INTEL_COMETLAKE_S + bool + select SOC_INTEL_COMETLAKE + +config SOC_INTEL_COMETLAKE_V + bool + select SOC_INTEL_COMETLAKE + +config SOC_INTEL_CANNONLAKE_PCH_H + bool + +if SOC_INTEL_CANNONLAKE_BASE + config MAX_CPUS int default 20 if SOC_INTEL_CANNONLAKE_PCH_H && SOC_INTEL_COMETLAKE diff --git a/src/soc/intel/denverton_ns/Kconfig b/src/soc/intel/denverton_ns/Kconfig index dcf9a5f..f8d3a75 100644 --- a/src/soc/intel/denverton_ns/Kconfig +++ b/src/soc/intel/denverton_ns/Kconfig @@ -2,17 +2,6 @@
config SOC_INTEL_DENVERTON_NS bool - help - Intel Denverton-NS SoC support - -if SOC_INTEL_DENVERTON_NS - -config CPU_INTEL_NUM_FIT_ENTRIES - int - default 1 - -config CPU_SPECIFIC_OPTIONS - def_bool y select ARCH_X86 select BOOT_DEVICE_SUPPORTS_WRITES select CACHE_MRC_SETTINGS @@ -51,6 +40,15 @@ select USE_FSP_NOTIFY_PHASE_READY_TO_BOOT select USE_FSP_NOTIFY_PHASE_END_OF_FIRMWARE
+ help + Intel Denverton-NS SoC support + +if SOC_INTEL_DENVERTON_NS + +config CPU_INTEL_NUM_FIT_ENTRIES + int + default 1 + config ECAM_MMCONF_BASE_ADDRESS default 0xe0000000
diff --git a/src/soc/intel/elkhartlake/Kconfig b/src/soc/intel/elkhartlake/Kconfig index 8e3dc11..531285e 100644 --- a/src/soc/intel/elkhartlake/Kconfig +++ b/src/soc/intel/elkhartlake/Kconfig @@ -1,12 +1,5 @@ config SOC_INTEL_ELKHARTLAKE bool - help - Intel Elkhartlake support - -if SOC_INTEL_ELKHARTLAKE - -config CPU_SPECIFIC_OPTIONS - def_bool y select ACPI_INTEL_HARDWARE_SLEEP_VALUES select ARCH_X86 select BOOT_DEVICE_SUPPORTS_WRITES @@ -67,6 +60,10 @@ select UDK_202005_BINDING select USE_FSP_NOTIFY_PHASE_POST_PCI_ENUM select SOC_INTEL_RAPL_DISABLE_VIA_MCHBAR + help + Intel Elkhartlake support + +if SOC_INTEL_ELKHARTLAKE
config MAX_CPUS int diff --git a/src/soc/intel/icelake/Kconfig b/src/soc/intel/icelake/Kconfig index aca73fa..92182f5 100644 --- a/src/soc/intel/icelake/Kconfig +++ b/src/soc/intel/icelake/Kconfig @@ -1,12 +1,5 @@ config SOC_INTEL_ICELAKE bool - help - Intel Icelake support - -if SOC_INTEL_ICELAKE - -config CPU_SPECIFIC_OPTIONS - def_bool y select ACPI_INTEL_HARDWARE_SLEEP_VALUES select ARCH_X86 select BOOT_DEVICE_SUPPORTS_WRITES @@ -67,6 +60,10 @@ select USE_FSP_NOTIFY_PHASE_READY_TO_BOOT select USE_FSP_NOTIFY_PHASE_END_OF_FIRMWARE select USE_INTEL_FSP_TO_CALL_COREBOOT_PUBLISH_MP_PPI + help + Intel Icelake support + +if SOC_INTEL_ICELAKE
config DISABLE_HECI1_AT_PRE_BOOT default y if MAINBOARD_HAS_CHROMEOS diff --git a/src/soc/intel/jasperlake/Kconfig b/src/soc/intel/jasperlake/Kconfig index 4ae21b8..6dde269 100644 --- a/src/soc/intel/jasperlake/Kconfig +++ b/src/soc/intel/jasperlake/Kconfig @@ -1,12 +1,5 @@ config SOC_INTEL_JASPERLAKE bool - help - Intel Jasperlake support - -if SOC_INTEL_JASPERLAKE - -config CPU_SPECIFIC_OPTIONS - def_bool y select ACPI_INTEL_HARDWARE_SLEEP_VALUES select ARCH_X86 select BOOT_DEVICE_SUPPORTS_WRITES @@ -73,6 +66,10 @@ select USE_FSP_NOTIFY_PHASE_READY_TO_BOOT select USE_FSP_NOTIFY_PHASE_END_OF_FIRMWARE select SOC_INTEL_COMMON_BASECODE if SOC_INTEL_CSE_LITE_SKU + help + Intel Jasperlake support + +if SOC_INTEL_JASPERLAKE
config DCACHE_RAM_BASE default 0xfef00000 diff --git a/src/soc/intel/meteorlake/Kconfig b/src/soc/intel/meteorlake/Kconfig index 4d69566..b6c39eb 100644 --- a/src/soc/intel/meteorlake/Kconfig +++ b/src/soc/intel/meteorlake/Kconfig @@ -1,12 +1,5 @@ config SOC_INTEL_METEORLAKE bool - help - Intel Meteorlake support - -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 @@ -92,6 +85,10 @@ select UDELAY_TSC select UDK_202111_BINDING select X86_INIT_NEED_1_SIPI + help + Intel Meteorlake support + +if SOC_INTEL_METEORLAKE
config SOC_INTEL_METEORLAKE_TCSS_USB4_SUPPORT bool diff --git a/src/soc/intel/quark/Kconfig b/src/soc/intel/quark/Kconfig index 58f01da..51e31ce 100644 --- a/src/soc/intel/quark/Kconfig +++ b/src/soc/intel/quark/Kconfig @@ -2,13 +2,6 @@
config SOC_INTEL_QUARK bool - help - Intel Quark support - -if SOC_INTEL_QUARK - -config CPU_SPECIFIC_OPTIONS - def_bool y select ACPI_NO_MADT select ARCH_X86 select NO_ECAM_MMCONF_SUPPORT @@ -27,6 +20,10 @@ select USE_FSP_NOTIFY_PHASE_READY_TO_BOOT select USE_FSP_NOTIFY_PHASE_END_OF_FIRMWARE select USE_MARCH_586 + help + Intel Quark support + +if SOC_INTEL_QUARK
##### # Debug serial output diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig index e15af04..d6a11363e 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 @@ 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 diff --git a/src/soc/intel/tigerlake/Kconfig b/src/soc/intel/tigerlake/Kconfig index bcf4a82..438cfd1 100644 --- a/src/soc/intel/tigerlake/Kconfig +++ b/src/soc/intel/tigerlake/Kconfig @@ -1,15 +1,5 @@ config SOC_INTEL_TIGERLAKE bool - help - Intel Tigerlake support - -config SOC_INTEL_TIGERLAKE_PCH_H - bool - -if SOC_INTEL_TIGERLAKE - -config CPU_SPECIFIC_OPTIONS - def_bool y select ACPI_INTEL_HARDWARE_SLEEP_VALUES select ARCH_X86 select BOOT_DEVICE_SUPPORTS_WRITES @@ -93,6 +83,13 @@ select USE_FSP_NOTIFY_PHASE_END_OF_FIRMWARE select SOC_INTEL_COMMON_BASECODE if SOC_INTEL_CSE_LITE_SKU select CR50_USE_LONG_INTERRUPT_PULSES if TPM_GOOGLE_CR50 + help + Intel Tigerlake support + +config SOC_INTEL_TIGERLAKE_PCH_H + bool + +if SOC_INTEL_TIGERLAKE
config MAX_CPUS int diff --git a/src/soc/intel/xeon_sp/Kconfig b/src/soc/intel/xeon_sp/Kconfig index 91b1569..2bd320f 100644 --- a/src/soc/intel/xeon_sp/Kconfig +++ b/src/soc/intel/xeon_sp/Kconfig @@ -6,26 +6,6 @@
config XEON_SP_COMMON_BASE bool - -config SOC_INTEL_SKYLAKE_SP - bool - select XEON_SP_COMMON_BASE - select PLATFORM_USES_FSP2_0 - help - Intel Skylake-SP support - -config SOC_INTEL_COOPERLAKE_SP - bool - select XEON_SP_COMMON_BASE - select PLATFORM_USES_FSP2_2 - select CACHE_MRC_SETTINGS - help - Intel Cooper Lake-SP support - -if XEON_SP_COMMON_BASE - -config CPU_SPECIFIC_OPTIONS - def_bool y select ACPI_INTEL_HARDWARE_SLEEP_VALUES select ARCH_X86 select BOOT_DEVICE_SUPPORTS_WRITES @@ -62,6 +42,24 @@ select USE_FSP_NOTIFY_PHASE_READY_TO_BOOT select USE_FSP_NOTIFY_PHASE_END_OF_FIRMWARE
+config SOC_INTEL_SKYLAKE_SP + bool + select XEON_SP_COMMON_BASE + select PLATFORM_USES_FSP2_0 + help + Intel Skylake-SP support + +config SOC_INTEL_COOPERLAKE_SP + bool + select XEON_SP_COMMON_BASE + select PLATFORM_USES_FSP2_2 + select CACHE_MRC_SETTINGS + select HAVE_INTEL_FSP_REPO + help + Intel Cooper Lake-SP support + +if XEON_SP_COMMON_BASE + config MAINBOARD_USES_FSP2_0 bool default y diff --git a/src/soc/intel/xeon_sp/cpx/Kconfig b/src/soc/intel/xeon_sp/cpx/Kconfig index aa344ce..c3bcc94 100644 --- a/src/soc/intel/xeon_sp/cpx/Kconfig +++ b/src/soc/intel/xeon_sp/cpx/Kconfig @@ -2,10 +2,6 @@
if SOC_INTEL_COOPERLAKE_SP
-config SOC_SPECIFIC_OPTIONS - def_bool y - select HAVE_INTEL_FSP_REPO - config FSP_HEADER_PATH default "3rdparty/fsp/CedarIslandFspBinPkg/Include"