From 426d7816e2652130efe060bbe5a12d01cef082c1 Mon Sep 17 00:00:00 2001 From: Ranjani Sridharan Date: Wed, 12 May 2021 11:31:41 -0700 Subject: [PATCH] topology: nocodec: switch to dynamic pipelines Switch the APL/CNL/ICL/JSL/TGL nocodec topologies to use dynamic pipelines. Signed-off-by: Ranjani Sridharan --- tools/topology/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/topology/CMakeLists.txt b/tools/topology/CMakeLists.txt index 3f91ba611..cf89d5b60 100644 --- a/tools/topology/CMakeLists.txt +++ b/tools/topology/CMakeLists.txt @@ -30,7 +30,7 @@ set(TPLGS "sof-hda-generic-idisp\;sof-hda-generic-idisp\;-DCHANNELS=0\;-DDYNAMIC=1" "sof-hda-generic-idisp\;sof-hda-generic-idisp-2ch\;-DCHANNELS=2\;-DDMICPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_48khz.m4\;-DDMIC16KPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_16khz.m4\;-DDYNAMIC=1" "sof-hda-generic-idisp\;sof-hda-generic-idisp-4ch\;-DCHANNELS=4\;-DDMICPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_48khz.m4\;-DDMIC16KPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_16khz.m4\;-DDYNAMIC=1" - "sof-apl-nocodec\;sof-apl-nocodec" + "sof-apl-nocodec\;sof-apl-nocodec\;-DDYNAMIC=1" "sof-apl-keyword-detect\;sof-apl-keyword-detect" "sof-bdw-codec\;sof-bdw-rt286\;-DCODEC=RT286" "sof-bdw-codec\;sof-bdw-rt5640\;-DCODEC=RT5640" @@ -78,8 +78,8 @@ set(TPLGS "sof-glk-da7219\;sof-glk-da7219\;-DHEADPHONE=da7219" "sof-glk-da7219\;sof-glk-cs42l42\;-DHEADPHONE=cs42l42" "sof-glk-rt5682\;sof-glk-rt5682" - "sof-icl-nocodec\;sof-icl-nocodec\;-DPLATFORM=icl" - "sof-icl-nocodec\;sof-jsl-nocodec\;-DPLATFORM=jsl" + "sof-icl-nocodec\;sof-icl-nocodec\;-DPLATFORM=icl\;-DDYNAMIC=1" + "sof-icl-nocodec\;sof-jsl-nocodec\;-DPLATFORM=jsl\;-DDYNAMIC=1" "sof-icl-dmic-4ch\;sof-icl-dmic-4ch" # sof-icl-r700 is kept for compatibility with CI and previous versions of the kernel. "sof-icl-rt700\;sof-icl-rt700\;-DCHANNELS=4\;-DPLATFORM=icl\;-DDMICPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_48khz.m4\;-DDMIC16KPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_16khz.m4" @@ -109,7 +109,7 @@ set(TPLGS "sof-cml-rt5682-kwd\;sof-icl-rt5682-kwd\;-DPLATFORM=icl" "sof-cml-demux-rt5682\;sof-cml-demux-rt5682\;-DPLATFORM=cml" "sof-cml-demux-rt5682\;sof-whl-demux-rt5682\;-DPLATFORM=whl" - "sof-cnl-nocodec\;sof-cnl-nocodec" + "sof-cnl-nocodec\;sof-cnl-nocodec\;-DDYNAMIC=1" "sof-cml-rt5682-max98357a\;sof-cml-rt5682-max98357a\;-DPLATFORM=cml" "sof-cml-demux-rt5682-max98357a\;sof-cml-demux-rt5682-max98357a\;-DPLATFORM=cml" "sof-cml-rt1011-rt5682\;sof-cml-rt1011-rt5682\;-DPLATFORM=cml\;-DPPROC=volume" @@ -118,7 +118,7 @@ set(TPLGS "sof-tgl-rt711-rt1308\;sof-tgl-rt711-rt1308-4ch\;-DCHANNELS=4\;-DEXT_AMP\;-DDMICPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_48khz.m4\;-DDMIC16KPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_16khz.m4\;-DPLATFORM=tgl" "sof-tgl-rt711-rt1308\;sof-adl-rt711-4ch\;-DCHANNELS=4\;-DDMICPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_48khz.m4\;-DDMIC16KPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_16khz.m4\;-DPLATFORM=adl" "sof-tgl-rt711-rt1308\;sof-adl-rt711\;-DCHANNELS=0\;-DPLATFORM=adl" - "sof-tgl-nocodec\;sof-ehl-nocodec" + "sof-tgl-nocodec\;sof-ehl-nocodec\;-DDYNAMIC=1" "sof-ehl-rt5660\;sof-ehl-rt5660\;-DHDMI=1" "sof-ehl-rt5660\;sof-ehl-rt5660-nohdmi" "sof-imx8-nocodec\;sof-imx8-nocodec"