From a07d8143c1186ef63edf790cf754f43de497a60d Mon Sep 17 00:00:00 2001 From: Ranjani Sridharan Date: Thu, 1 Dec 2022 08:22:59 -0800 Subject: [PATCH 1/2] topology2: avs-tplg: Build ADL nocodec tplg This will avoid having to rename the TGL tplg on ADL devices. Signed-off-by: Ranjani Sridharan --- tools/topology/topology2/avs-tplg/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/topology/topology2/avs-tplg/CMakeLists.txt b/tools/topology/topology2/avs-tplg/CMakeLists.txt index 1dea5f30d82a..7a6d4843240a 100644 --- a/tools/topology/topology2/avs-tplg/CMakeLists.txt +++ b/tools/topology/topology2/avs-tplg/CMakeLists.txt @@ -25,6 +25,8 @@ PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-4ch.bin,USE_CHAIN_DMA=true # CAVS SSP topology for TGL "cavs-nocodec\;sof-tgl-nocodec\;NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\ PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-tgl-nocodec.bin" +"cavs-nocodec\;sof-adl-nocodec\;NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\ +PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-adl-nocodec.bin" ) add_custom_target(topology2_cavs) From 488922c93e2233d1b7daf5ee8063c936613fb770 Mon Sep 17 00:00:00 2001 From: Ranjani Sridharan Date: Thu, 1 Dec 2022 08:24:36 -0800 Subject: [PATCH 2/2] topology2: sof-ace-tplg: Rename sof-mtl-sdw To it's actual name sof-mtl-rt711-4ch. Signed-off-by: Ranjani Sridharan --- tools/topology/topology2/sof-ace-tplg/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/topology/topology2/sof-ace-tplg/CMakeLists.txt b/tools/topology/topology2/sof-ace-tplg/CMakeLists.txt index 57246fe4a51b..bd7720224429 100644 --- a/tools/topology/topology2/sof-ace-tplg/CMakeLists.txt +++ b/tools/topology/topology2/sof-ace-tplg/CMakeLists.txt @@ -20,8 +20,8 @@ HDA_CONFIG=mix,NUM_DMICS=2,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic "cavs-sdw\;mtl-sdw-hdmi\;NUM_HDMIS=4" # SDW + DMIC topology with passthrough pipelines -"cavs-sdw\;mtl-sdw-dmic\;NUM_DMICS=4,DMIC0_ID=2,DMIC1_ID=3,\ -PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-mtl-sdw-dmic.bin" +"cavs-sdw\;sof-mtl-rt711-4ch\;NUM_DMICS=4,DMIC0_ID=2,DMIC1_ID=3,\ +PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-mtl-rt711-4ch.bin" # SSP topology for MTL "cavs-nocodec\;sof-mtl-nocodec\;PLATFORM=mtl,NUM_DMICS=2,\