4 files changed, 31 insertions, 40 deletions
diff --git a/src/soc/intel/xeon_sp/Kconfig b/src/soc/intel/xeon_sp/Kconfig
index 24f749a02b..63ced01067 100644
--- a/src/soc/intel/xeon_sp/Kconfig
+++ b/src/soc/intel/xeon_sp/Kconfig
@@ -4,38 +4,6 @@ source "src/soc/intel/xeon_sp/*/Kconfig"
 
 config XEON_SP_COMMON_BASE
 	bool
-
-config SOC_INTEL_SKYLAKE_SP
-	bool
-	select XEON_SP_COMMON_BASE
-	select PLATFORM_USES_FSP2_0
-	select NO_FSP_TEMP_RAM_EXIT
-	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 NO_FSP_TEMP_RAM_EXIT
-	help
-	  Intel Cooper Lake-SP support
-
-config SOC_INTEL_SAPPHIRERAPIDS_SP
-	bool
-	select CACHE_MRC_SETTINGS
-	select CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED
-	select PLATFORM_USES_FSP2_3
-	select SOC_INTEL_CSE_SERVER_SKU
-	select XEON_SP_COMMON_BASE
-	help
-	  Intel Sapphire Rapids-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
@@ -72,6 +40,8 @@ config	CPU_SPECIFIC_OPTIONS
 	select USE_FSP_NOTIFY_PHASE_READY_TO_BOOT
 	select USE_FSP_NOTIFY_PHASE_END_OF_FIRMWARE
 
+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 aa344ce16c..f54f7716b6 100644
--- a/src/soc/intel/xeon_sp/cpx/Kconfig
+++ b/src/soc/intel/xeon_sp/cpx/Kconfig
@@ -1,10 +1,16 @@
 ## SPDX-License-Identifier: GPL-2.0-only
 
-if SOC_INTEL_COOPERLAKE_SP
-
-config SOC_SPECIFIC_OPTIONS
-	def_bool y
+config SOC_INTEL_COOPERLAKE_SP
+	bool
+	select XEON_SP_COMMON_BASE
+	select PLATFORM_USES_FSP2_2
+	select CACHE_MRC_SETTINGS
+	select NO_FSP_TEMP_RAM_EXIT
 	select HAVE_INTEL_FSP_REPO
+	help
+	  Intel Cooper Lake-SP support
+
+if SOC_INTEL_COOPERLAKE_SP
 
 config FSP_HEADER_PATH
 	default "3rdparty/fsp/CedarIslandFspBinPkg/Include"
diff --git a/src/soc/intel/xeon_sp/skx/Kconfig b/src/soc/intel/xeon_sp/skx/Kconfig
index 18e5f2f59a..c2c3d4e2e8 100644
--- a/src/soc/intel/xeon_sp/skx/Kconfig
+++ b/src/soc/intel/xeon_sp/skx/Kconfig
@@ -1,5 +1,13 @@
 ## SPDX-License-Identifier: GPL-2.0-only
 
+config SOC_INTEL_SKYLAKE_SP
+	bool
+	select XEON_SP_COMMON_BASE
+	select PLATFORM_USES_FSP2_0
+	select NO_FSP_TEMP_RAM_EXIT
+	help
+	  Intel Skylake-SP support
+
 if SOC_INTEL_SKYLAKE_SP
 
 config MAINBOARD_USES_FSP2_0
diff --git a/src/soc/intel/xeon_sp/spr/Kconfig b/src/soc/intel/xeon_sp/spr/Kconfig
index c3710ac976..9c19f3b1cc 100644
--- a/src/soc/intel/xeon_sp/spr/Kconfig
+++ b/src/soc/intel/xeon_sp/spr/Kconfig
@@ -1,14 +1,21 @@
 ## SPDX-License-Identifier: GPL-2.0-only
 
-if SOC_INTEL_SAPPHIRERAPIDS_SP
-
-config SOC_SPECIFIC_OPTIONS
-	def_bool y
+config SOC_INTEL_SAPPHIRERAPIDS_SP
+	bool
 	select MICROCODE_BLOB_NOT_HOOKED_UP
 	select SAVE_MRC_AFTER_FSPS
 	select SOC_INTEL_MEM_MAPPED_PM_CONFIGURATION
 	select DISABLE_ACPI_HIBERNATE
 	select DEFAULT_X2APIC_RUNTIME
+	select CACHE_MRC_SETTINGS
+	select CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED
+	select PLATFORM_USES_FSP2_3
+	select SOC_INTEL_CSE_SERVER_SKU
+	select XEON_SP_COMMON_BASE
+	help
+	  Intel Sapphire Rapids-SP support
+
+if SOC_INTEL_SAPPHIRERAPIDS_SP
 
 config CHIPSET_DEVICETREE
 	string