topology2: Merge avs-tplg and sof-ace-tplg under production target

Merge the avs-tplg and sof-ace-tplg under a common production target.

The build-tools.sh is updated at the same time to extrace the topology
files under
tools/build_tools/topology/topology2/production/release/

In accordance to the sof-docs specification, see link.

$ tree tools/build_tools/topology/topology2/production/release
tools/build_tools/topology/topology2/production/release
├── sof-ace-tplg -> sof-ipc4-tplg
└── sof-ipc4-tplg
    ├── sof-adl-rt711-4ch.tplg
    ├── sof-adl-rt711-l0-rt1316-l12-rt714-l3.tplg
    ├── sof-hda-generic-2ch.tplg
    ├── sof-hda-generic-4ch.tplg
    ├── sof-hda-generic-ace1-2ch.tplg
    ├── sof-hda-generic-ace1-4ch.tplg
    ├── sof-hda-generic-cavs25-2ch.tplg
    ├── sof-hda-generic-cavs25-4ch.tplg
    ├── sof-hda-generic-idisp.tplg
    ├── sof-hda-generic.tplg
    ├── sof-lnl-rt711-4ch.tplg
    ├── sof-lnl-rt711-l0-rt1316-l23-rt714-l1.tplg
    ├── sof-lnl-rt712-l2-rt1712-l3.tplg
    ├── sof-mtl-cs42l43-l0-cs35l56-l12.tplg
    ├── sof-mtl-es83x6-ssp1-hdmi-ssp02.tplg
    ├── sof-mtl-max98357a-rt5682-ssp2-ssp0-2ch-pdm1.tplg
    ├── sof-mtl-max98357a-rt5682-ssp2-ssp0.tplg
    ├── sof-mtl-max98357a-rt5682.tplg
    ├── sof-mtl-rt1019-rt5682.tplg
    ├── sof-mtl-rt1318-l12-rt714-l0.tplg
    ├── sof-mtl-rt5650-dts.tplg
    ├── sof-mtl-rt711-4ch.tplg
    ├── sof-mtl-rt711-l0-rt1316-l23-rt714-l1.tplg
    ├── sof-mtl-rt712-l0-rt1712-l3.tplg
    ├── sof-mtl-rt713-l0-rt1316-l12-rt1713-l3.tplg
    ├── sof-mtl-rt713-l0-rt1316-l12.tplg
    ├── sof-mtl-rt722-l0.tplg
    ├── sof-mtl-sdw-cs42l42-l0-max98363-l2.tplg
    ├── sof-tgl-cs42l43-l3-cs35l56-l01.tplg
    ├── sof-tgl-rt711-rt1308-4ch.tplg
    ├── sof-tgl-rt711-rt1308-rt715.tplg
    ├── sof-tgl-rt711-rt1316-rt714.tplg
    ├── sof-tgl-rt712.tplg
    └── sof-tgl-rt715-rt711-rt1308-mono.tplg

The sof-hda-generic-2/4ch.tplg will be generated without embedded NHLT as
it is not used under normal circumstance.
Two flavor of the generic topology is generated for CAVS2.5 and ACE1/2 with
included NHLT binary in case it is used by existing users, but it is
unlikely.

As noted in the documentation, on the deployed system a symlink is needed
for ACE1/2 platforms for backwards compatibility:
sof-ace-tplg -> sof-ipc4-tplg

Link: https://github.com/thesofproject/sof-docs/blob/master/getting_started/intel_debug/introduction.rst#2-topology-file
Signed-off-by: Peter Ujfalusi <[email protected]>

scripts/build-tools.sh

@@ -146,12 +146,20 @@ main()
                 exit 0
         fi
 
-        # Keep 'topologies' first because it's the noisiest.
-        for util in topologies tests; do
-                if eval '$DO_BUILD_'$util; then
-                        make_tool $util
-                fi
-        done
+        if eval $DO_BUILD_topologies; then
+                make_tool topologies
+
+                TPLG2_RELEASE_PATH="$BUILD_TOOLS_DIR/topology/topology2/production/target/"
+                echo ""; echo "Target directory for topology2: $TPLG2_RELEASE_PATH"
+                mkdir -p "$TPLG2_RELEASE_PATH/sof-ipc4-tplg"
+                mv $BUILD_TOOLS_DIR/topology/topology2/production/*.tplg $TPLG2_RELEASE_PATH/sof-ipc4-tplg/
+
+                ln -rsf $TPLG2_RELEASE_PATH/sof-ipc4-tplg $TPLG2_RELEASE_PATH/sof-ace-tplg
+        fi
+
+        if eval $DO_BUILD_tests; then
+                make_tool tests
+        fi
 
         for tool in ctl logger probes; do
                 if eval '$DO_BUILD_'$tool; then

tools/topology/topology2/CMakeLists.txt

@@ -29,7 +29,6 @@ add_custom_target(abi_target
 	DEPENDS abi.conf
 )
 
-add_dependencies(topologies2 topology2_cavs topology2_ace topology2_dev)
-add_subdirectory(avs-tplg)
+add_dependencies(topologies2 topology2_dev topology2)
 add_subdirectory(development)
-add_subdirectory(sof-ace-tplg)
+add_subdirectory(production)

tools/topology/topology2/avs-tplg/CMakeLists.txt → tools/topology/topology2/production/CMakeLists.txt

@@ -1,8 +1,11 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
-include(tplg-targets.cmake)
+include(tplg-targets-hda-generic.cmake)
+include(tplg-targets-cavs25.cmake)
+include(tplg-targets-ace1.cmake)
+include(tplg-targets-ace2.cmake)
 
-add_custom_target(topology2_cavs)
+add_custom_target(topology2)
 
 foreach(tplg ${TPLGS})
 	set(defines "")
@@ -22,6 +25,6 @@ foreach(tplg ${TPLGS})
 	  "${CMAKE_CURRENT_SOURCE_DIR}/../${input}" "${output}"
 	  "${CMAKE_CURRENT_SOURCE_DIR}/../" "${defines}")
 
-	add_custom_target(topology2_avs_${output} DEPENDS ${output}.tplg)
-	add_dependencies(topology2_cavs topology2_avs_${output})
+	add_custom_target(topology2_${output} DEPENDS ${output}.tplg)
+	add_dependencies(topology2 topology2_${output})
 endforeach()

tools/topology/topology2/sof-ace-tplg/tplg-targets.cmake → tools/topology/topology2/production/tplg-targets-ace1.cmake

@@ -1,19 +1,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 # Array of "input-file-name;output-file-name;comma separated pre-processor variables"
-set(TPLGS
-# HDMI only topology with passthrough pipelines
-"sof-hda-generic\;sof-hda-generic-idisp\;"
-# HDA topology with mixer-based pipelines for HDA and passthrough pipelines for HDMI
-"sof-hda-generic\;sof-hda-generic\;HDA_CONFIG=mix"
-# If the alsatplg plugins for NHLT are not available, the NHLT blobs will not be added to the
-# topologies below.
-"sof-hda-generic\;sof-hda-generic-4ch\;PLATFORM=mtl,\
-HDA_CONFIG=mix,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,PREPROCESS_PLUGINS=nhlt,\
-NHLT_BIN=nhlt-sof-hda-generic-4ch.bin"
-"sof-hda-generic\;sof-hda-generic-2ch\;PLATFORM=mtl,\
-HDA_CONFIG=mix,NUM_DMICS=2,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-2ch.bin"
-
+list(APPEND TPLGS
 # SDW + DMIC topology with passthrough pipelines
 # We will change NUM_HDMIS to 3 once HDMI is enabled on MTL RVP
 "cavs-sdw\;sof-mtl-rt711-4ch\;PLATFORM=mtl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
@@ -91,19 +79,4 @@ PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-mtl-sdw-cs42l42-l0-max98363-l2.bin,\
 BT_NAME=SSP1-BT,BT_INDEX=1,BT_PCM_ID=20,BT_ID=8,BT_PCM_NAME=Bluetooth,ADD_BT=true,\
 NUM_SDW_AMP_LINKS=1,SDW_SPK_STREAM=SDW2-Playback,SDW_AMP_FEEDBACK=false,\
 SDW_JACK_CAPTURE_CH=1"
-
-# SDW topology for LNL RVP
-"cavs-sdw\;sof-lnl-rt711-4ch\;PLATFORM=lnl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
-DMIC0_ID=2,DMIC1_ID=3,NUM_HDMIS=0,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-lnl-rt711-4ch.bin"
-
-"cavs-sdw\;sof-lnl-rt711-l0-rt1316-l23-rt714-l1\;PLATFORM=lnl,NUM_SDW_AMP_LINKS=2,SDW_DMIC=1,\
-NUM_HDMIS=0,SDW_SPK_STREAM=SDW2-Playback,SDW_SPK_IN_STREAM=SDW2-Capture,SDW_DMIC_STREAM=SDW1-Capture"
-
-"cavs-sdw\;sof-lnl-rt712-l2-rt1712-l3\;PLATFORM=lnl,SDW_DMIC=1,NUM_HDMIS=0,NUM_SDW_AMP_LINKS=1,\
-SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,SDW_DMIC_STREAM=Capture-SmartMic,\
-SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack"
-
-"cavs-sdw\;sof-lnl-rt722-l0\;PLATFORM=lnl,SDW_DMIC=1,NUM_HDMIS=0,NUM_SDW_AMP_LINKS=1,\
-SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,SDW_DMIC_STREAM=Capture-SmartMic,\
-SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack"
 )

tools/topology/topology2/production/tplg-targets-ace2.cmake

@@ -0,0 +1,20 @@
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Array of "input-file-name;output-file-name;comma separated pre-processor variables"
+list(APPEND TPLGS
+# SDW topology for LNL RVP
+"cavs-sdw\;sof-lnl-rt711-4ch\;PLATFORM=lnl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
+DMIC0_ID=2,DMIC1_ID=3,NUM_HDMIS=0,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-lnl-rt711-4ch.bin"
+
+"cavs-sdw\;sof-lnl-rt711-l0-rt1316-l23-rt714-l1\;PLATFORM=lnl,NUM_SDW_AMP_LINKS=2,SDW_DMIC=1,\
+NUM_HDMIS=0,SDW_SPK_STREAM=SDW2-Playback,SDW_SPK_IN_STREAM=SDW2-Capture,SDW_DMIC_STREAM=SDW1-Capture"
+
+"cavs-sdw\;sof-lnl-rt712-l2-rt1712-l3\;PLATFORM=lnl,SDW_DMIC=1,NUM_HDMIS=0,NUM_SDW_AMP_LINKS=1,\
+SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,SDW_DMIC_STREAM=Capture-SmartMic,\
+SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack"
+
+"cavs-sdw\;sof-lnl-rt722-l0\;PLATFORM=lnl,SDW_DMIC=1,NUM_HDMIS=0,NUM_SDW_AMP_LINKS=1,\
+SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,SDW_DMIC_STREAM=Capture-SmartMic,\
+SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack"
+
+)

tools/topology/topology2/avs-tplg/tplg-targets.cmake → tools/topology/topology2/production/tplg-targets-cavs25.cmake

@@ -1,19 +1,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 # Array of "input-file-name;output-file-name;comma separated pre-processor variables"
-set(TPLGS
-# CAVS HDMI only topology with passthrough pipelines
-"sof-hda-generic\;sof-hda-generic-idisp\;"
-# CAVS HDA topology with mixer-based pipelines for HDA and passthrough pipelines for HDMI
-"sof-hda-generic\;sof-hda-generic\;HDA_CONFIG=mix"
-# If the alsatplg plugins for NHLT are not available, the NHLT blobs will not be added to the
-# topologies below.
-"sof-hda-generic\;sof-hda-generic-2ch\;\
-HDA_CONFIG=mix,NUM_DMICS=2,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-2ch.bin"
-"sof-hda-generic\;sof-hda-generic-4ch\;\
-HDA_CONFIG=mix,NUM_DMICS=4,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-4ch.bin,\
-PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1"
-
+list(APPEND TPLGS
 # IPC4 topology for TGL rt711 Headset + rt1316 Amplifier + rt714 DMIC
 "cavs-sdw\;sof-tgl-rt711-rt1316-rt714\;NUM_SDW_AMP_LINKS=2,SDW_DMIC=1,\
 PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-tgl-rt711-rt1316-rt714.bin"

tools/topology/topology2/production/tplg-targets-hda-generic.cmake

@@ -0,0 +1,37 @@
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Array of "input-file-name;output-file-name;comma separated pre-processor variables"
+list(APPEND TPLGS
+# HDMI only topology with passthrough pipelines
+"sof-hda-generic\;sof-hda-generic-idisp\;"
+# HDA topology with mixer-based pipelines for HDA and
+# passthrough pipelines for HDMI
+"sof-hda-generic\;sof-hda-generic\;HDA_CONFIG=mix"
+# HDA topology with mixer-based pipelines for HDA and
+# passthrough pipelines for HDMI and
+# 2 or 4 DMIC, no NHLT blob included in topology
+"sof-hda-generic\;sof-hda-generic-2ch\;HDA_CONFIG=mix,NUM_DMICS=2"
+"sof-hda-generic\;sof-hda-generic-4ch\;HDA_CONFIG=mix,NUM_DMICS=4,\
+PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1"
+
+# HDA topology with mixer-based pipelines for HDA and
+# passthrough pipelines for HDMI and
+# 2 or 4 DMIC, no NHLT blob included in topology
+
+# Note: If the alsatplg plugins for NHLT are not available, the NHLT blobs will
+# not be added to the topologies below.
+
+# Topologies for CAVS2.5 architecture
+"sof-hda-generic\;sof-hda-generic-cavs25-2ch\;HDA_CONFIG=mix,NUM_DMICS=2,\
+PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-cavs25-2ch.bin"
+"sof-hda-generic\;sof-hda-generic-cavs25-4ch\;HDA_CONFIG=mix,NUM_DMICS=4,\
+PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
+PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-cavs25-4ch.bin"
+
+# Topologies for ACE1 and ACE2 architectures
+"sof-hda-generic\;sof-hda-generic-ace1-2ch\;PLATFORM=mtl,HDA_CONFIG=mix,NUM_DMICS=2,\
+PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-ace1-2ch.bin"
+"sof-hda-generic\;sof-hda-generic-ace1-4ch\;PLATFORM=mtl,HDA_CONFIG=mix,NUM_DMICS=4,\
+PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
+PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-ace1-4ch.bin"
+)