diff --git a/src/soc/intel/alderlake/chip.h b/src/soc/intel/alderlake/chip.h
index fa9fce2998..e1ac015e96 100644
--- a/src/soc/intel/alderlake/chip.h
+++ b/src/soc/intel/alderlake/chip.h
@@ -206,6 +206,9 @@ struct soc_intel_alderlake_config {
 	/* Enable Pch iSCLK */
 	uint8_t pch_isclk;
 
+	/* CNVi BT Core Enable/Disable */
+	bool CnviBtCore;
+
 	/* CNVi BT Audio Offload: Enable/Disable BT Audio Offload. */
 	bool CnviBtAudioOffload;
 
diff --git a/src/soc/intel/alderlake/fsp_params.c b/src/soc/intel/alderlake/fsp_params.c
index fcfad984db..19afbc4eaa 100644
--- a/src/soc/intel/alderlake/fsp_params.c
+++ b/src/soc/intel/alderlake/fsp_params.c
@@ -247,13 +247,12 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd)
 	/* CNVi */
 	dev = pcidev_path_on_root(PCH_DEVFN_CNVI_WIFI);
 	params->CnviMode = is_dev_enabled(dev);
-
-	/* CNVi BT Core */
-	dev = pcidev_path_on_root(PCH_DEVFN_CNVI_BT);
-	params->CnviBtCore = is_dev_enabled(dev);
-
-	/* CNVi BT Audio Offload */
+	params->CnviBtCore = config->CnviBtCore;
 	params->CnviBtAudioOffload = config->CnviBtAudioOffload;
+	/* Assert if CNVi BT is enabled without CNVi being enabled. */
+	assert(params->CnviMode || !params->CnviBtCore);
+	/* Assert if CNVi BT offload is enabled without CNVi BT being enabled. */
+	assert(params->CnviBtCore || !params->CnviBtAudioOffload);
 
 	/* VMD */
 	dev = pcidev_path_on_root(SA_DEVFN_VMD);