2 files changed, 10 insertions, 6 deletions
diff --git a/src/mainboard/google/brox/variants/brox/overridetree.cb b/src/mainboard/google/brox/variants/brox/overridetree.cb
index d13b276db3..a0e83b2b2f 100644
--- a/src/mainboard/google/brox/variants/brox/overridetree.cb
+++ b/src/mainboard/google/brox/variants/brox/overridetree.cb
@@ -9,9 +9,9 @@ fw_config
 		option STORAGE_UFS			1
 		option STORAGE_NVME			2
 	end
-	field WIFI 4 4
-		option WIFI_CNVI			0
-		option WIFI_PCIE			1
+	field WIFI_BT 4 4
+		option WIFI_BT_CNVI			0
+		option WIFI_BT_PCIE			1
 	end
 	field AUDIO 5 7
 		option AUDIO_UNKNOWN			0
@@ -194,7 +194,7 @@ chip soc/intel/alderlake
 				register "srcclk_pin" = "1"
 				device generic 0 on end
 			end
-			probe WIFI WIFI_PCIE
+			probe WIFI_BT WIFI_BT_PCIE
 		end
 		device ref cnvi_wifi on
 			chip drivers/wifi/generic
@@ -203,7 +203,7 @@ chip soc/intel/alderlake
 				register "enable_cnvi_ddr_rfim" = "true"
 				device generic 0 on end
 			end
-			probe WIFI WIFI_CNVI
+			probe WIFI_BT WIFI_BT_CNVI
 		end
 		device ref ish on
 			chip drivers/intel/ish
diff --git a/src/mainboard/google/brox/variants/brox/variant.c b/src/mainboard/google/brox/variants/brox/variant.c
index 39162d5bf6..e085a86ff8 100644
--- a/src/mainboard/google/brox/variants/brox/variant.c
+++ b/src/mainboard/google/brox/variants/brox/variant.c
@@ -8,9 +8,13 @@
 
 void variant_update_soc_chip_config(struct soc_intel_alderlake_config *config)
 {
+	if (fw_config_probe(FW_CONFIG(WIFI_BT, WIFI_BT_CNVI))) {
+		printk(BIOS_INFO, "CNVi bluetooth enabled by fw_config\n");
+		config->cnvi_bt_core = true;
+	}
 }
 
 const char *get_wifi_sar_cbfs_filename(void)
 {
-	return get_wifi_sar_fw_config_filename(FW_CONFIG_FIELD(WIFI));
+	return get_wifi_sar_fw_config_filename(FW_CONFIG_FIELD(WIFI_BT));
 }