summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/soc/intel/meteorlake/fsp_params.c19
1 files changed, 13 insertions, 6 deletions
diff --git a/src/soc/intel/meteorlake/fsp_params.c b/src/soc/intel/meteorlake/fsp_params.c
index 4127ff7628..3c14b759cc 100644
--- a/src/soc/intel/meteorlake/fsp_params.c
+++ b/src/soc/intel/meteorlake/fsp_params.c
@@ -565,12 +565,19 @@ static void fill_fsps_cnvi_params(FSP_S_CONFIG *s_cfg,
s_cfg->CnviWifiCore = config->cnvi_wifi_core;
s_cfg->CnviBtCore = config->cnvi_bt_core;
s_cfg->CnviBtAudioOffload = config->cnvi_bt_audio_offload;
- /* Assert if CNVi WiFi is enabled without CNVi being enabled. */
- assert(s_cfg->CnviMode || !s_cfg->CnviWifiCore);
- /* Assert if CNVi BT is enabled without CNVi being enabled. */
- assert(s_cfg->CnviMode || !s_cfg->CnviBtCore);
- /* Assert if CNVi BT offload is enabled without CNVi BT being enabled. */
- assert(s_cfg->CnviBtCore || !s_cfg->CnviBtAudioOffload);
+ if (!s_cfg->CnviMode && s_cfg->CnviWifiCore) {
+ printk(BIOS_ERR, "CNVi WiFi is enabled without CNVi being enabled\n");
+ s_cfg->CnviWifiCore = 0;
+ }
+ if (!s_cfg->CnviBtCore && s_cfg->CnviBtAudioOffload) {
+ printk(BIOS_ERR, "BT offload is enabled without CNVi BT being enabled\n");
+ s_cfg->CnviBtAudioOffload = 0;
+ }
+ if (!s_cfg->CnviMode && s_cfg->CnviBtCore) {
+ printk(BIOS_ERR, "CNVi BT is enabled without CNVi being enabled\n");
+ s_cfg->CnviBtCore = 0;
+ s_cfg->CnviBtAudioOffload = 0;
+ }
}
static void fill_fsps_vmd_params(FSP_S_CONFIG *s_cfg,