diff --git a/src/soc/intel/common/block/cpu/Kconfig b/src/soc/intel/common/block/cpu/Kconfig
index 17240ac91f..ea81457466 100644
--- a/src/soc/intel/common/block/cpu/Kconfig
+++ b/src/soc/intel/common/block/cpu/Kconfig
@@ -154,3 +154,11 @@ config SOC_INTEL_SET_MIN_CLOCK_RATIO
 	  the lowest possible CPU clock. Enable this option if you need smallest
 	  possible CPU clock. This setting can be overruled by the OS if it has an
 	  p-state driver which can adjust the clock to its need.
+
+config HAVE_HYPERTHREADING
+	def_bool n
+
+config FSP_HYPERTHREADING
+	bool "Enable Hyper-Threading"
+	depends on HAVE_HYPERTHREADING
+	default y
diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
index a5f8a47d52..0db9c5cb64 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -35,6 +35,7 @@ config CPU_SPECIFIC_OPTIONS
 	select GENERIC_GPIO_LIB
 	select HAVE_FSP_GOP
 	select HAVE_FSP_LOGO_SUPPORT
+	select HAVE_HYPERTHREADING
 	select HAVE_INTEL_FSP_REPO
 	select INTEL_CAR_NEM_ENHANCED
 	select HAVE_SMI_HANDLER
@@ -99,10 +100,6 @@ config MAX_CPUS
 	default 16 if MAINBOARD_SUPPORTS_COFFEELAKE_CPU
 	default 8
 
-config FSP_HYPERTHREADING
-	bool "Enable Hyper-Threading"
-	default y
-
 config ENABLE_SATA_TEST_MODE
 	bool "Enable SATA test mode"
 	default n