diff --git a/src/soc/intel/meteorlake/Kconfig b/src/soc/intel/meteorlake/Kconfig
index 1883851a70..020ebeb4f8 100644
--- a/src/soc/intel/meteorlake/Kconfig
+++ b/src/soc/intel/meteorlake/Kconfig
@@ -74,11 +74,7 @@ config CPU_SPECIFIC_OPTIONS
 	select SOC_INTEL_COMMON_BLOCK_SA
 	select SOC_INTEL_COMMON_BLOCK_SMM
 	select SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP
-	select SOC_INTEL_COMMON_BLOCK_TCSS
 	select SOC_INTEL_COMMON_BLOCK_THERMAL_BEHIND_PMC
-	select SOC_INTEL_COMMON_BLOCK_USB4
-	select SOC_INTEL_COMMON_BLOCK_USB4_PCIE
-	select SOC_INTEL_COMMON_BLOCK_USB4_XHCI
 	select SOC_INTEL_COMMON_BLOCK_XHCI
 	select SOC_INTEL_COMMON_BLOCK_XHCI_ELOG
 	select SOC_INTEL_COMMON_BASECODE
@@ -97,6 +93,14 @@ config CPU_SPECIFIC_OPTIONS
 	select UDK_202111_BINDING
 	select X86_INIT_NEED_1_SIPI
 
+config SOC_INTEL_METEORLAKE_TCSS_USB4_SUPPORT
+	bool
+	default y
+	select SOC_INTEL_COMMON_BLOCK_TCSS
+	select SOC_INTEL_COMMON_BLOCK_USB4
+	select SOC_INTEL_COMMON_BLOCK_USB4_PCIE
+	select SOC_INTEL_COMMON_BLOCK_USB4_XHCI
+
 config MAX_CPUS
 	int
 	default 22