From fb2fc8193038393f5c5bf3f7d171a8082e5c81a3 Mon Sep 17 00:00:00 2001 From: Ranjani Sridharan Date: Wed, 16 Jun 2021 12:42:11 -0700 Subject: [PATCH] topology: prepare for Topology2.0 In preparation for Topology2.0, move the current topology files to the topology1 folder and once the 1.0 topologies are built copy them to the /sof/tools/build-tools/topology folder. When Topology2.0 topologies come along, they will be built into the topology2 folder and the 2.0 binaries will be copied over the 1.0 binaries. Signed-off-by: Ranjani Sridharan --- tools/test/topology/tplg-build.sh | 2 +- tools/topology/CMakeLists.txt | 213 +---------------- tools/topology/topology1/CMakeLists.txt | 214 ++++++++++++++++++ tools/topology/{ => topology1}/common/abi.m4 | 0 .../topology/{ => topology1}/common/memory.m4 | 0 tools/topology/{ => topology1}/common/tlv.m4 | 0 .../development/CMakeLists.txt | 10 +- .../development/sof-apl-asrc-pcm512x.m4 | 0 .../development/sof-apl-asrc-wm8804.m4 | 0 .../development/sof-apl-dmic-a96k-b16k.m4 | 0 .../development/sof-apl-dmic-asymmetric.m4 | 0 .../development/sof-apl-dmic.m4 | 0 .../development/sof-apl-pcm512x-nohdmi.m4 | 0 .../development/sof-apl-src-50khz-pcm512x.m4 | 0 .../sof-cml-rt1011-rt5682-nokwd.m4 | 0 .../development/sof-cml-src-rt5682.m4 | 0 .../development/sof-hda-asrc.m4 | 0 .../development/sof-imx8-src-cs42888.m4 | 0 .../development/sof-imx8-src-wm8960.m4 | 0 .../development/sof-imx8mp-src-wm8960.m4 | 0 .../development/sof-tgl-nocodec-ci.m4 | 0 .../dsp_enhancement/CMakeLists.txt | 6 +- tools/topology/{ => topology1}/get_abi.sh | 0 tools/topology/{ => topology1}/m4/asrc.m4 | 0 tools/topology/{ => topology1}/m4/buffer.m4 | 0 .../{ => topology1}/m4/bytecontrol.m4 | 0 tools/topology/{ => topology1}/m4/ch_sel.m4 | 0 .../{ => topology1}/m4/codec_adapter.m4 | 0 .../topology/{ => topology1}/m4/crossover.m4 | 0 .../m4/crossover_coef_default.m4 | 0 tools/topology/{ => topology1}/m4/dai.m4 | 0 tools/topology/{ => topology1}/m4/dcblock.m4 | 0 .../m4/dcblock_coef_default.m4 | 0 tools/topology/{ => topology1}/m4/debug.m4 | 0 tools/topology/{ => topology1}/m4/detect.m4 | 0 .../{ => topology1}/m4/detect_test_coef.m4 | 0 tools/topology/{ => topology1}/m4/drc.m4 | 0 .../{ => topology1}/m4/drc_coef_default.m4 | 0 .../{ => topology1}/m4/enumcontrol.m4 | 0 tools/topology/{ => topology1}/m4/eq_fir.m4 | 0 .../{ => topology1}/m4/eq_fir_coef_flat.m4 | 0 .../m4/eq_fir_coef_loudness.m4 | 0 .../{ => topology1}/m4/eq_fir_coef_mid.m4 | 0 .../{ => topology1}/m4/eq_fir_coef_pass.m4 | 0 tools/topology/{ => topology1}/m4/eq_iir.m4 | 0 .../{ => topology1}/m4/eq_iir_bundle.m4 | 0 .../m4/eq_iir_coef_bandpass.m4 | 0 .../m4/eq_iir_coef_bassboost.m4 | 0 .../{ => topology1}/m4/eq_iir_coef_drceq.m4 | 0 .../{ => topology1}/m4/eq_iir_coef_flat.m4 | 0 .../m4/eq_iir_coef_highpass_20hz_0db_16khz.m4 | 0 .../m4/eq_iir_coef_highpass_20hz_0db_48khz.m4 | 0 .../eq_iir_coef_highpass_20hz_20db_16khz.m4 | 0 .../eq_iir_coef_highpass_20hz_20db_48khz.m4 | 0 .../m4/eq_iir_coef_highpass_30hz_0db_16khz.m4 | 0 .../m4/eq_iir_coef_highpass_30hz_0db_48khz.m4 | 0 .../eq_iir_coef_highpass_30hz_20db_16khz.m4 | 0 .../eq_iir_coef_highpass_30hz_20db_48khz.m4 | 0 .../m4/eq_iir_coef_highpass_40hz_0db_16khz.m4 | 0 .../m4/eq_iir_coef_highpass_40hz_0db_48khz.m4 | 0 .../eq_iir_coef_highpass_40hz_20db_16khz.m4 | 0 .../eq_iir_coef_highpass_40hz_20db_48khz.m4 | 0 .../m4/eq_iir_coef_highpass_50hz_0db_16khz.m4 | 0 .../m4/eq_iir_coef_highpass_50hz_0db_48khz.m4 | 0 .../eq_iir_coef_highpass_50hz_20db_16khz.m4 | 0 .../eq_iir_coef_highpass_50hz_20db_48khz.m4 | 0 .../m4/eq_iir_coef_loudness.m4 | 0 .../{ => topology1}/m4/eq_iir_coef_pass.m4 | 0 .../m4/google_hotword_detect.m4 | 0 tools/topology/{ => topology1}/m4/igo_nr.m4 | 0 tools/topology/{ => topology1}/m4/kpbm.m4 | 0 tools/topology/{ => topology1}/m4/mixer.m4 | 0 .../{ => topology1}/m4/mixercontrol.m4 | 0 .../{ => topology1}/m4/multiband_drc.m4 | 0 .../m4/multiband_drc_coef_default.m4 | 0 tools/topology/{ => topology1}/m4/muxdemux.m4 | 0 tools/topology/{ => topology1}/m4/pcm.m4 | 0 tools/topology/{ => topology1}/m4/pga.m4 | 0 tools/topology/{ => topology1}/m4/pipeline.m4 | 0 .../topology/{ => topology1}/m4/smart_amp.m4 | 0 tools/topology/{ => topology1}/m4/src.m4 | 0 tools/topology/{ => topology1}/m4/tdfb.m4 | 0 .../tdfb/coef_line2_50mm_az0el0deg_16khz.m4 | 0 .../tdfb/coef_line2_50mm_az0el0deg_48khz.m4 | 0 .../tdfb/coef_line2_50mm_az10el0deg_16khz.m4 | 0 .../tdfb/coef_line2_50mm_az10el0deg_48khz.m4 | 0 .../tdfb/coef_line2_50mm_az25el0deg_16khz.m4 | 0 .../tdfb/coef_line2_50mm_az25el0deg_48khz.m4 | 0 .../tdfb/coef_line2_50mm_az90el0deg_16khz.m4 | 0 .../tdfb/coef_line2_50mm_az90el0deg_48khz.m4 | 0 .../tdfb/coef_line2_50mm_azm10el0deg_16khz.m4 | 0 .../tdfb/coef_line2_50mm_azm10el0deg_48khz.m4 | 0 .../tdfb/coef_line2_50mm_azm25el0deg_16khz.m4 | 0 .../tdfb/coef_line2_50mm_azm25el0deg_48khz.m4 | 0 .../tdfb/coef_line2_50mm_azm90el0deg_16khz.m4 | 0 .../tdfb/coef_line2_50mm_azm90el0deg_48khz.m4 | 0 .../m4/tdfb/coef_line2_50mm_pm10deg_16khz.m4 | 0 .../m4/tdfb/coef_line2_50mm_pm10deg_48khz.m4 | 0 .../m4/tdfb/coef_line2_50mm_pm25deg_16khz.m4 | 0 .../m4/tdfb/coef_line2_50mm_pm25deg_48khz.m4 | 0 .../m4/tdfb/coef_line2_50mm_pm90deg_16khz.m4 | 0 .../m4/tdfb/coef_line2_50mm_pm90deg_48khz.m4 | 0 .../tdfb/coef_line2_67mm_az0el0deg_16khz.m4 | 0 .../tdfb/coef_line2_67mm_az0el0deg_48khz.m4 | 0 .../tdfb/coef_line2_67mm_az10el0deg_16khz.m4 | 0 .../tdfb/coef_line2_67mm_az10el0deg_48khz.m4 | 0 .../tdfb/coef_line2_67mm_az25el0deg_16khz.m4 | 0 .../tdfb/coef_line2_67mm_az25el0deg_48khz.m4 | 0 .../tdfb/coef_line2_67mm_az90el0deg_16khz.m4 | 0 .../tdfb/coef_line2_67mm_az90el0deg_48khz.m4 | 0 .../tdfb/coef_line2_67mm_azm10el0deg_16khz.m4 | 0 .../tdfb/coef_line2_67mm_azm10el0deg_48khz.m4 | 0 .../tdfb/coef_line2_67mm_azm25el0deg_16khz.m4 | 0 .../tdfb/coef_line2_67mm_azm25el0deg_48khz.m4 | 0 .../tdfb/coef_line2_67mm_azm90el0deg_16khz.m4 | 0 .../tdfb/coef_line2_67mm_azm90el0deg_48khz.m4 | 0 .../m4/tdfb/coef_line2_pass.m4 | 0 .../tdfb/coef_line4_28mm_az0el0deg_16khz.m4 | 0 .../tdfb/coef_line4_28mm_az0el0deg_48khz.m4 | 0 .../tdfb/coef_line4_28mm_az10el0deg_16khz.m4 | 0 .../tdfb/coef_line4_28mm_az10el0deg_48khz.m4 | 0 .../tdfb/coef_line4_28mm_az25el0deg_16khz.m4 | 0 .../tdfb/coef_line4_28mm_az25el0deg_48khz.m4 | 0 .../tdfb/coef_line4_28mm_az90el0deg_16khz.m4 | 0 .../tdfb/coef_line4_28mm_az90el0deg_48khz.m4 | 0 .../tdfb/coef_line4_28mm_azm10el0deg_16khz.m4 | 0 .../tdfb/coef_line4_28mm_azm10el0deg_48khz.m4 | 0 .../tdfb/coef_line4_28mm_azm25el0deg_16khz.m4 | 0 .../tdfb/coef_line4_28mm_azm25el0deg_48khz.m4 | 0 .../tdfb/coef_line4_28mm_azm90el0deg_16khz.m4 | 0 .../tdfb/coef_line4_28mm_azm90el0deg_48khz.m4 | 0 .../m4/tdfb/coef_line4_28mm_pm10deg_16khz.m4 | 0 .../m4/tdfb/coef_line4_28mm_pm10deg_48khz.m4 | 0 .../m4/tdfb/coef_line4_28mm_pm25deg_16khz.m4 | 0 .../m4/tdfb/coef_line4_28mm_pm25deg_48khz.m4 | 0 .../m4/tdfb/coef_line4_28mm_pm90deg_16khz.m4 | 0 .../m4/tdfb/coef_line4_28mm_pm90deg_48khz.m4 | 0 .../tdfb/coef_line4_78mm_az0el0deg_16khz.m4 | 0 .../tdfb/coef_line4_78mm_az0el0deg_48khz.m4 | 0 .../tdfb/coef_line4_78mm_az10el0deg_16khz.m4 | 0 .../tdfb/coef_line4_78mm_az10el0deg_48khz.m4 | 0 .../tdfb/coef_line4_78mm_az25el0deg_16khz.m4 | 0 .../tdfb/coef_line4_78mm_az25el0deg_48khz.m4 | 0 .../tdfb/coef_line4_78mm_az90el0deg_16khz.m4 | 0 .../tdfb/coef_line4_78mm_az90el0deg_48khz.m4 | 0 .../tdfb/coef_line4_78mm_azm10el0deg_16khz.m4 | 0 .../tdfb/coef_line4_78mm_azm10el0deg_48khz.m4 | 0 .../tdfb/coef_line4_78mm_azm25el0deg_16khz.m4 | 0 .../tdfb/coef_line4_78mm_azm25el0deg_48khz.m4 | 0 .../tdfb/coef_line4_78mm_azm90el0deg_16khz.m4 | 0 .../tdfb/coef_line4_78mm_azm90el0deg_48khz.m4 | 0 .../m4/tdfb/coef_line4_pass.m4 | 0 tools/topology/{ => topology1}/m4/tone.m4 | 0 tools/topology/{ => topology1}/m4/utils.m4 | 0 .../{ => topology1}/platform/common/alh.m4 | 0 .../{ => topology1}/platform/common/esai.m4 | 0 .../{ => topology1}/platform/common/hda.m4 | 0 .../{ => topology1}/platform/common/sai.m4 | 0 .../{ => topology1}/platform/common/ssp.m4 | 0 .../{ => topology1}/platform/imx/imx8.m4 | 0 .../{ => topology1}/platform/intel/adl.m4 | 0 .../platform/intel/apl-dmic-a2b2.m4 | 0 .../platform/intel/apl-dmic-a2b4.m4 | 0 .../platform/intel/apl-dmic-a4b2.m4 | 0 .../{ => topology1}/platform/intel/bdw.m4 | 0 .../{ => topology1}/platform/intel/bxt.m4 | 0 .../platform/intel/byt-codec.m4 | 0 .../platform/intel/byt-nocodec.m4 | 0 .../{ => topology1}/platform/intel/byt.m4 | 0 .../platform/intel/cht-codec.m4 | 0 .../platform/intel/cht-nocodec.m4 | 0 .../{ => topology1}/platform/intel/cht.m4 | 0 .../platform/intel/cml-da7219.m4 | 0 .../{ => topology1}/platform/intel/cml.m4 | 0 .../{ => topology1}/platform/intel/cnl.m4 | 0 .../{ => topology1}/platform/intel/dmic.m4 | 0 .../{ => topology1}/platform/intel/ehl.m4 | 0 .../platform/intel/glk-da7219.m4 | 0 .../{ => topology1}/platform/intel/hsw.m4 | 0 .../{ => topology1}/platform/intel/icl.m4 | 0 .../platform/intel/intel-generic-bt.m4 | 0 .../platform/intel/intel-generic-dmic-kwd.m4 | 0 .../platform/intel/intel-generic-dmic.m4 | 0 .../platform/intel/jsl-dedede.m4 | 0 .../platform/intel/jsl-rt1015.m4 | 0 .../{ => topology1}/platform/intel/jsl.m4 | 0 .../{ => topology1}/platform/intel/tgl.m4 | 0 .../{ => topology1}/platform/intel/whl.m4 | 0 .../{ => topology1}/sof-apl-da7219.m4 | 0 .../{ => topology1}/sof-apl-demux-pcm512x.m4 | 0 .../{ => topology1}/sof-apl-keyword-detect.m4 | 0 .../{ => topology1}/sof-apl-nocodec.m4 | 0 .../{ => topology1}/sof-apl-pcm512x.m4 | 0 .../topology/{ => topology1}/sof-apl-rt298.m4 | 0 .../{ => topology1}/sof-apl-tdf8532.m4 | 0 .../{ => topology1}/sof-apl-wm8804.m4 | 0 .../topology/{ => topology1}/sof-bdw-codec.m4 | 0 .../{ => topology1}/sof-bdw-nocodec.m4 | 0 .../topology/{ => topology1}/sof-byt-codec.m4 | 0 .../{ => topology1}/sof-cht-max98090.m4 | 0 .../{ => topology1}/sof-cht-nocodec.m4 | 0 .../sof-cml-demux-rt5682-max98357a.m4 | 0 .../{ => topology1}/sof-cml-demux-rt5682.m4 | 0 .../{ => topology1}/sof-cml-rt1011-rt5682.m4 | 0 .../{ => topology1}/sof-cml-rt5682-kwd.m4 | 0 .../sof-cml-rt5682-max98357a.m4 | 0 .../{ => topology1}/sof-cml-rt5682.m4 | 0 .../topology/{ => topology1}/sof-cml-rt700.m4 | 0 .../{ => topology1}/sof-cnl-nocodec.m4 | 0 .../topology/{ => topology1}/sof-cnl-rt274.m4 | 0 .../{ => topology1}/sof-cnl-rt5682-sdw2.m4 | 0 .../{ => topology1}/sof-ehl-rt5660.m4 | 0 .../{ => topology1}/sof-glk-da7219-kwd.m4 | 0 .../{ => topology1}/sof-glk-da7219.m4 | 0 .../{ => topology1}/sof-glk-rt5682.m4 | 0 .../{ => topology1}/sof-hda-generic-idisp.m4 | 0 .../{ => topology1}/sof-hda-generic-kwd.m4 | 0 .../{ => topology1}/sof-hda-generic.m4 | 0 .../{ => topology1}/sof-icl-dmic-4ch.m4 | 0 .../{ => topology1}/sof-icl-nocodec.m4 | 0 .../topology/{ => topology1}/sof-icl-rt700.m4 | 0 .../sof-icl-rt711-rt1308-rt715-hdmi.m4 | 0 .../{ => topology1}/sof-imx8-cs42888-mixer.m4 | 0 .../{ => topology1}/sof-imx8-cs42888.m4 | 0 .../{ => topology1}/sof-imx8-nocodec-sai.m4 | 0 .../{ => topology1}/sof-imx8-nocodec.m4 | 0 .../{ => topology1}/sof-imx8-wm8960-kwd.m4 | 0 .../{ => topology1}/sof-imx8-wm8960-mixer.m4 | 0 .../{ => topology1}/sof-imx8-wm8960.m4 | 0 .../{ => topology1}/sof-imx8mp-wm8960-kwd.m4 | 0 .../sof-imx8mp-wm8960-mixer.m4 | 0 .../{ => topology1}/sof-imx8mp-wm8960.m4 | 0 .../{ => topology1}/sof-jsl-da7219.m4 | 0 .../{ => topology1}/sof-jsl-rt5682.m4 | 0 .../sof-smart-amplifier-nocodec.m4 | 0 .../{ => topology1}/sof-smart-amplifier.m4 | 0 .../sof-tgl-max98357a-rt5682.m4 | 0 .../sof-tgl-max98373-rt5682.m4 | 0 .../{ => topology1}/sof-tgl-nocodec.m4 | 0 .../{ => topology1}/sof-tgl-rt711-rt1308.m4 | 0 .../sof-tgl-sdw-max98373-rt5682.m4 | 0 .../sof/pipe-amp-ref-capture.m4 | 0 .../{ => topology1}/sof/pipe-asrc-capture.m4 | 0 .../{ => topology1}/sof/pipe-asrc-playback.m4 | 0 .../sof/pipe-asrc-volume-capture.m4 | 0 .../sof/pipe-asrc-volume-playback.m4 | 0 .../sof/pipe-codec-adapter-capture.m4 | 0 .../sof/pipe-codec-adapter-playback.m4 | 0 .../sof/pipe-crossover-playback.m4 | 0 .../{ => topology1}/sof/pipe-dai-capture.m4 | 0 .../{ => topology1}/sof/pipe-dai-endpoint.m4 | 0 .../{ => topology1}/sof/pipe-dai-playback.m4 | 0 .../sof/pipe-dai-sched-playback.m4 | 0 .../sof/pipe-dcblock-capture.m4 | 0 .../sof/pipe-dcblock-playback.m4 | 0 .../sof/pipe-dcblock-volume-playback.m4 | 0 .../{ => topology1}/sof/pipe-detect.m4 | 0 .../{ => topology1}/sof/pipe-drc-capture.m4 | 0 .../sof/pipe-drc-eq-volume-demux-playback.m4 | 0 .../{ => topology1}/sof/pipe-drc-playback.m4 | 0 .../sof/pipe-eq-fir-capture.m4 | 0 .../sof/pipe-eq-fir-playback.m4 | 0 .../sof/pipe-eq-fir-volume-capture.m4 | 0 .../sof/pipe-eq-fir-volume-playback.m4 | 0 .../sof/pipe-eq-iir-capture.m4 | 0 .../sof/pipe-eq-iir-eq-fir-volume-playback.m4 | 0 .../sof/pipe-eq-iir-playback.m4 | 0 .../sof/pipe-eq-iir-volume-capture-16khz.m4 | 0 .../sof/pipe-eq-iir-volume-capture.m4 | 0 .../sof/pipe-eq-iir-volume-playback.m4 | 0 .../sof/pipe-google-hotword-detect.m4 | 0 .../sof/pipe-highpass-capture.m4 | 0 .../sof/pipe-highpass-switch-capture.m4 | 0 .../sof/pipe-host-volume-playback.m4 | 0 .../{ => topology1}/sof/pipe-igonr-capture.m4 | 0 .../{ => topology1}/sof/pipe-kfbm-capture.m4 | 0 .../sof/pipe-kfbm-no-lp-capture.m4 | 0 .../sof/pipe-low-latency-capture.m4 | 0 .../sof/pipe-low-latency-playback.m4 | 0 .../sof/pipe-mixer-dai-playback.m4 | 0 .../sof/pipe-multiband-drc-capture.m4 | 0 .../sof/pipe-multiband-drc-playback.m4 | 0 .../sof/pipe-passthrough-capture-sched.m4 | 0 .../sof/pipe-passthrough-capture.m4 | 0 .../sof/pipe-passthrough-playback.m4 | 0 .../{ => topology1}/sof/pipe-pcm-media.m4 | 0 .../sof/pipe-processing-playback.m4 | 0 .../sof/pipe-smart-amplifier-playback.m4 | 0 .../{ => topology1}/sof/pipe-src-capture.m4 | 0 .../{ => topology1}/sof/pipe-src-playback.m4 | 0 .../sof/pipe-src-volume-capture.m4 | 0 .../sof/pipe-src-volume-playback.m4 | 0 .../sof/pipe-tdfb-capture-16khz.m4 | 0 .../{ => topology1}/sof/pipe-tdfb-capture.m4 | 0 .../pipe-tdfb-eq-iir-volume-capture-16khz.m4 | 0 .../sof/pipe-tdfb-eq-iir-volume-capture.m4 | 0 .../{ => topology1}/sof/pipe-tdfb-playback.m4 | 0 .../sof/pipe-tdfb-volume-capture-16khz.m4 | 0 .../sof/pipe-tdfb-volume-capture.m4 | 0 .../topology/{ => topology1}/sof/pipe-tone.m4 | 0 .../sof/pipe-vol-kfbm-capture.m4 | 0 .../sof/pipe-volume-capture-16khz.m4 | 0 .../sof/pipe-volume-capture-sched.m4 | 0 .../sof/pipe-volume-capture.m4 | 0 .../sof/pipe-volume-demux-playback.m4 | 0 .../sof/pipe-volume-playback.m4 | 0 .../sof/pipe-volume-switch-capture.m4 | 0 .../sof/pipe-waves-codec-demux-playback.m4 | 0 .../sof/pipe-waves-codec-playback.m4 | 0 tools/topology/{ => topology1}/sof/tokens.m4 | 0 .../topology2/include/common/route.conf | 0 .../topology2/include/common/tokens.conf | 0 .../include/common/vendor-token.conf | 0 .../topology2/include/components/asrc.conf | 0 .../topology2/include/components/buffer.conf | 0 .../topology2/include/components/dai.conf | 0 .../topology2/include/components/host.conf | 0 .../include/components/pipeline.conf | 0 .../topology2/include/components/src.conf | 0 .../topology2/include/components/volume.conf | 0 .../include/components/widget-common.conf | 0 .../topology2/include/controls/common.conf | 0 .../topology2/include/controls/mixer.conf | 0 323 files changed, 226 insertions(+), 219 deletions(-) create mode 100644 tools/topology/topology1/CMakeLists.txt rename tools/topology/{ => topology1}/common/abi.m4 (100%) rename tools/topology/{ => topology1}/common/memory.m4 (100%) rename tools/topology/{ => topology1}/common/tlv.m4 (100%) rename tools/topology/{ => topology1}/development/CMakeLists.txt (97%) rename tools/topology/{ => topology1}/development/sof-apl-asrc-pcm512x.m4 (100%) rename tools/topology/{ => topology1}/development/sof-apl-asrc-wm8804.m4 (100%) rename tools/topology/{ => topology1}/development/sof-apl-dmic-a96k-b16k.m4 (100%) rename tools/topology/{ => topology1}/development/sof-apl-dmic-asymmetric.m4 (100%) rename tools/topology/{ => topology1}/development/sof-apl-dmic.m4 (100%) rename tools/topology/{ => topology1}/development/sof-apl-pcm512x-nohdmi.m4 (100%) rename tools/topology/{ => topology1}/development/sof-apl-src-50khz-pcm512x.m4 (100%) rename tools/topology/{ => topology1}/development/sof-cml-rt1011-rt5682-nokwd.m4 (100%) rename tools/topology/{ => topology1}/development/sof-cml-src-rt5682.m4 (100%) rename tools/topology/{ => topology1}/development/sof-hda-asrc.m4 (100%) rename tools/topology/{ => topology1}/development/sof-imx8-src-cs42888.m4 (100%) rename tools/topology/{ => topology1}/development/sof-imx8-src-wm8960.m4 (100%) rename tools/topology/{ => topology1}/development/sof-imx8mp-src-wm8960.m4 (100%) rename tools/topology/{ => topology1}/development/sof-tgl-nocodec-ci.m4 (100%) rename tools/topology/{ => topology1}/dsp_enhancement/CMakeLists.txt (95%) rename tools/topology/{ => topology1}/get_abi.sh (100%) rename tools/topology/{ => topology1}/m4/asrc.m4 (100%) rename tools/topology/{ => topology1}/m4/buffer.m4 (100%) rename tools/topology/{ => topology1}/m4/bytecontrol.m4 (100%) rename tools/topology/{ => topology1}/m4/ch_sel.m4 (100%) rename tools/topology/{ => topology1}/m4/codec_adapter.m4 (100%) rename tools/topology/{ => topology1}/m4/crossover.m4 (100%) rename tools/topology/{ => topology1}/m4/crossover_coef_default.m4 (100%) rename tools/topology/{ => topology1}/m4/dai.m4 (100%) rename tools/topology/{ => topology1}/m4/dcblock.m4 (100%) rename tools/topology/{ => topology1}/m4/dcblock_coef_default.m4 (100%) rename tools/topology/{ => topology1}/m4/debug.m4 (100%) rename tools/topology/{ => topology1}/m4/detect.m4 (100%) rename tools/topology/{ => topology1}/m4/detect_test_coef.m4 (100%) rename tools/topology/{ => topology1}/m4/drc.m4 (100%) rename tools/topology/{ => topology1}/m4/drc_coef_default.m4 (100%) rename tools/topology/{ => topology1}/m4/enumcontrol.m4 (100%) rename tools/topology/{ => topology1}/m4/eq_fir.m4 (100%) rename tools/topology/{ => topology1}/m4/eq_fir_coef_flat.m4 (100%) rename tools/topology/{ => topology1}/m4/eq_fir_coef_loudness.m4 (100%) rename tools/topology/{ => topology1}/m4/eq_fir_coef_mid.m4 (100%) rename tools/topology/{ => topology1}/m4/eq_fir_coef_pass.m4 (100%) rename tools/topology/{ => topology1}/m4/eq_iir.m4 (100%) rename tools/topology/{ => topology1}/m4/eq_iir_bundle.m4 (100%) rename tools/topology/{ => topology1}/m4/eq_iir_coef_bandpass.m4 (100%) rename tools/topology/{ => topology1}/m4/eq_iir_coef_bassboost.m4 (100%) rename tools/topology/{ => topology1}/m4/eq_iir_coef_drceq.m4 (100%) rename tools/topology/{ => topology1}/m4/eq_iir_coef_flat.m4 (100%) rename tools/topology/{ => topology1}/m4/eq_iir_coef_highpass_20hz_0db_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/eq_iir_coef_highpass_20hz_0db_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/eq_iir_coef_highpass_20hz_20db_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/eq_iir_coef_highpass_20hz_20db_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/eq_iir_coef_highpass_30hz_0db_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/eq_iir_coef_highpass_30hz_0db_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/eq_iir_coef_highpass_30hz_20db_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/eq_iir_coef_highpass_30hz_20db_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/eq_iir_coef_highpass_40hz_0db_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/eq_iir_coef_highpass_40hz_0db_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/eq_iir_coef_highpass_40hz_20db_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/eq_iir_coef_highpass_40hz_20db_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/eq_iir_coef_highpass_50hz_0db_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/eq_iir_coef_highpass_50hz_0db_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/eq_iir_coef_highpass_50hz_20db_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/eq_iir_coef_highpass_50hz_20db_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/eq_iir_coef_loudness.m4 (100%) rename tools/topology/{ => topology1}/m4/eq_iir_coef_pass.m4 (100%) rename tools/topology/{ => topology1}/m4/google_hotword_detect.m4 (100%) rename tools/topology/{ => topology1}/m4/igo_nr.m4 (100%) rename tools/topology/{ => topology1}/m4/kpbm.m4 (100%) rename tools/topology/{ => topology1}/m4/mixer.m4 (100%) rename tools/topology/{ => topology1}/m4/mixercontrol.m4 (100%) rename tools/topology/{ => topology1}/m4/multiband_drc.m4 (100%) rename tools/topology/{ => topology1}/m4/multiband_drc_coef_default.m4 (100%) rename tools/topology/{ => topology1}/m4/muxdemux.m4 (100%) rename tools/topology/{ => topology1}/m4/pcm.m4 (100%) rename tools/topology/{ => topology1}/m4/pga.m4 (100%) rename tools/topology/{ => topology1}/m4/pipeline.m4 (100%) rename tools/topology/{ => topology1}/m4/smart_amp.m4 (100%) rename tools/topology/{ => topology1}/m4/src.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_50mm_az0el0deg_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_50mm_az0el0deg_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_50mm_az10el0deg_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_50mm_az10el0deg_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_50mm_az25el0deg_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_50mm_az25el0deg_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_50mm_az90el0deg_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_50mm_az90el0deg_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_50mm_azm10el0deg_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_50mm_azm10el0deg_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_50mm_azm25el0deg_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_50mm_azm25el0deg_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_50mm_azm90el0deg_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_50mm_azm90el0deg_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_50mm_pm10deg_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_50mm_pm10deg_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_50mm_pm25deg_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_50mm_pm25deg_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_50mm_pm90deg_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_50mm_pm90deg_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_67mm_az0el0deg_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_67mm_az0el0deg_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_67mm_az10el0deg_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_67mm_az10el0deg_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_67mm_az25el0deg_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_67mm_az25el0deg_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_67mm_az90el0deg_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_67mm_az90el0deg_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_67mm_azm10el0deg_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_67mm_azm10el0deg_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_67mm_azm25el0deg_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_67mm_azm25el0deg_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_67mm_azm90el0deg_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_67mm_azm90el0deg_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line2_pass.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_28mm_az0el0deg_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_28mm_az0el0deg_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_28mm_az10el0deg_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_28mm_az10el0deg_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_28mm_az25el0deg_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_28mm_az25el0deg_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_28mm_az90el0deg_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_28mm_az90el0deg_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_28mm_azm10el0deg_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_28mm_azm10el0deg_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_28mm_azm25el0deg_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_28mm_azm25el0deg_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_28mm_azm90el0deg_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_28mm_azm90el0deg_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_28mm_pm10deg_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_28mm_pm10deg_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_28mm_pm25deg_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_28mm_pm25deg_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_28mm_pm90deg_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_28mm_pm90deg_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_78mm_az0el0deg_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_78mm_az0el0deg_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_78mm_az10el0deg_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_78mm_az10el0deg_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_78mm_az25el0deg_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_78mm_az25el0deg_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_78mm_az90el0deg_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_78mm_az90el0deg_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_78mm_azm10el0deg_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_78mm_azm10el0deg_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_78mm_azm25el0deg_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_78mm_azm25el0deg_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_78mm_azm90el0deg_16khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_78mm_azm90el0deg_48khz.m4 (100%) rename tools/topology/{ => topology1}/m4/tdfb/coef_line4_pass.m4 (100%) rename tools/topology/{ => topology1}/m4/tone.m4 (100%) rename tools/topology/{ => topology1}/m4/utils.m4 (100%) rename tools/topology/{ => topology1}/platform/common/alh.m4 (100%) rename tools/topology/{ => topology1}/platform/common/esai.m4 (100%) rename tools/topology/{ => topology1}/platform/common/hda.m4 (100%) rename tools/topology/{ => topology1}/platform/common/sai.m4 (100%) rename tools/topology/{ => topology1}/platform/common/ssp.m4 (100%) rename tools/topology/{ => topology1}/platform/imx/imx8.m4 (100%) rename tools/topology/{ => topology1}/platform/intel/adl.m4 (100%) rename tools/topology/{ => topology1}/platform/intel/apl-dmic-a2b2.m4 (100%) rename tools/topology/{ => topology1}/platform/intel/apl-dmic-a2b4.m4 (100%) rename tools/topology/{ => topology1}/platform/intel/apl-dmic-a4b2.m4 (100%) rename tools/topology/{ => topology1}/platform/intel/bdw.m4 (100%) rename tools/topology/{ => topology1}/platform/intel/bxt.m4 (100%) rename tools/topology/{ => topology1}/platform/intel/byt-codec.m4 (100%) rename tools/topology/{ => topology1}/platform/intel/byt-nocodec.m4 (100%) rename tools/topology/{ => topology1}/platform/intel/byt.m4 (100%) rename tools/topology/{ => topology1}/platform/intel/cht-codec.m4 (100%) rename tools/topology/{ => topology1}/platform/intel/cht-nocodec.m4 (100%) rename tools/topology/{ => topology1}/platform/intel/cht.m4 (100%) rename tools/topology/{ => topology1}/platform/intel/cml-da7219.m4 (100%) rename tools/topology/{ => topology1}/platform/intel/cml.m4 (100%) rename tools/topology/{ => topology1}/platform/intel/cnl.m4 (100%) rename tools/topology/{ => topology1}/platform/intel/dmic.m4 (100%) rename tools/topology/{ => topology1}/platform/intel/ehl.m4 (100%) rename tools/topology/{ => topology1}/platform/intel/glk-da7219.m4 (100%) rename tools/topology/{ => topology1}/platform/intel/hsw.m4 (100%) rename tools/topology/{ => topology1}/platform/intel/icl.m4 (100%) rename tools/topology/{ => topology1}/platform/intel/intel-generic-bt.m4 (100%) rename tools/topology/{ => topology1}/platform/intel/intel-generic-dmic-kwd.m4 (100%) rename tools/topology/{ => topology1}/platform/intel/intel-generic-dmic.m4 (100%) rename tools/topology/{ => topology1}/platform/intel/jsl-dedede.m4 (100%) rename tools/topology/{ => topology1}/platform/intel/jsl-rt1015.m4 (100%) rename tools/topology/{ => topology1}/platform/intel/jsl.m4 (100%) rename tools/topology/{ => topology1}/platform/intel/tgl.m4 (100%) rename tools/topology/{ => topology1}/platform/intel/whl.m4 (100%) rename tools/topology/{ => topology1}/sof-apl-da7219.m4 (100%) rename tools/topology/{ => topology1}/sof-apl-demux-pcm512x.m4 (100%) rename tools/topology/{ => topology1}/sof-apl-keyword-detect.m4 (100%) rename tools/topology/{ => topology1}/sof-apl-nocodec.m4 (100%) rename tools/topology/{ => topology1}/sof-apl-pcm512x.m4 (100%) rename tools/topology/{ => topology1}/sof-apl-rt298.m4 (100%) rename tools/topology/{ => topology1}/sof-apl-tdf8532.m4 (100%) rename tools/topology/{ => topology1}/sof-apl-wm8804.m4 (100%) rename tools/topology/{ => topology1}/sof-bdw-codec.m4 (100%) rename tools/topology/{ => topology1}/sof-bdw-nocodec.m4 (100%) rename tools/topology/{ => topology1}/sof-byt-codec.m4 (100%) rename tools/topology/{ => topology1}/sof-cht-max98090.m4 (100%) rename tools/topology/{ => topology1}/sof-cht-nocodec.m4 (100%) rename tools/topology/{ => topology1}/sof-cml-demux-rt5682-max98357a.m4 (100%) rename tools/topology/{ => topology1}/sof-cml-demux-rt5682.m4 (100%) rename tools/topology/{ => topology1}/sof-cml-rt1011-rt5682.m4 (100%) rename tools/topology/{ => topology1}/sof-cml-rt5682-kwd.m4 (100%) rename tools/topology/{ => topology1}/sof-cml-rt5682-max98357a.m4 (100%) rename tools/topology/{ => topology1}/sof-cml-rt5682.m4 (100%) rename tools/topology/{ => topology1}/sof-cml-rt700.m4 (100%) rename tools/topology/{ => topology1}/sof-cnl-nocodec.m4 (100%) rename tools/topology/{ => topology1}/sof-cnl-rt274.m4 (100%) rename tools/topology/{ => topology1}/sof-cnl-rt5682-sdw2.m4 (100%) rename tools/topology/{ => topology1}/sof-ehl-rt5660.m4 (100%) rename tools/topology/{ => topology1}/sof-glk-da7219-kwd.m4 (100%) rename tools/topology/{ => topology1}/sof-glk-da7219.m4 (100%) rename tools/topology/{ => topology1}/sof-glk-rt5682.m4 (100%) rename tools/topology/{ => topology1}/sof-hda-generic-idisp.m4 (100%) rename tools/topology/{ => topology1}/sof-hda-generic-kwd.m4 (100%) rename tools/topology/{ => topology1}/sof-hda-generic.m4 (100%) rename tools/topology/{ => topology1}/sof-icl-dmic-4ch.m4 (100%) rename tools/topology/{ => topology1}/sof-icl-nocodec.m4 (100%) rename tools/topology/{ => topology1}/sof-icl-rt700.m4 (100%) rename tools/topology/{ => topology1}/sof-icl-rt711-rt1308-rt715-hdmi.m4 (100%) rename tools/topology/{ => topology1}/sof-imx8-cs42888-mixer.m4 (100%) rename tools/topology/{ => topology1}/sof-imx8-cs42888.m4 (100%) rename tools/topology/{ => topology1}/sof-imx8-nocodec-sai.m4 (100%) rename tools/topology/{ => topology1}/sof-imx8-nocodec.m4 (100%) rename tools/topology/{ => topology1}/sof-imx8-wm8960-kwd.m4 (100%) rename tools/topology/{ => topology1}/sof-imx8-wm8960-mixer.m4 (100%) rename tools/topology/{ => topology1}/sof-imx8-wm8960.m4 (100%) rename tools/topology/{ => topology1}/sof-imx8mp-wm8960-kwd.m4 (100%) rename tools/topology/{ => topology1}/sof-imx8mp-wm8960-mixer.m4 (100%) rename tools/topology/{ => topology1}/sof-imx8mp-wm8960.m4 (100%) rename tools/topology/{ => topology1}/sof-jsl-da7219.m4 (100%) rename tools/topology/{ => topology1}/sof-jsl-rt5682.m4 (100%) rename tools/topology/{ => topology1}/sof-smart-amplifier-nocodec.m4 (100%) rename tools/topology/{ => topology1}/sof-smart-amplifier.m4 (100%) rename tools/topology/{ => topology1}/sof-tgl-max98357a-rt5682.m4 (100%) rename tools/topology/{ => topology1}/sof-tgl-max98373-rt5682.m4 (100%) rename tools/topology/{ => topology1}/sof-tgl-nocodec.m4 (100%) rename tools/topology/{ => topology1}/sof-tgl-rt711-rt1308.m4 (100%) rename tools/topology/{ => topology1}/sof-tgl-sdw-max98373-rt5682.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-amp-ref-capture.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-asrc-capture.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-asrc-playback.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-asrc-volume-capture.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-asrc-volume-playback.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-codec-adapter-capture.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-codec-adapter-playback.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-crossover-playback.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-dai-capture.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-dai-endpoint.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-dai-playback.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-dai-sched-playback.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-dcblock-capture.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-dcblock-playback.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-dcblock-volume-playback.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-detect.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-drc-capture.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-drc-eq-volume-demux-playback.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-drc-playback.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-eq-fir-capture.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-eq-fir-playback.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-eq-fir-volume-capture.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-eq-fir-volume-playback.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-eq-iir-capture.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-eq-iir-eq-fir-volume-playback.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-eq-iir-playback.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-eq-iir-volume-capture-16khz.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-eq-iir-volume-capture.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-eq-iir-volume-playback.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-google-hotword-detect.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-highpass-capture.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-highpass-switch-capture.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-host-volume-playback.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-igonr-capture.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-kfbm-capture.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-kfbm-no-lp-capture.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-low-latency-capture.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-low-latency-playback.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-mixer-dai-playback.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-multiband-drc-capture.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-multiband-drc-playback.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-passthrough-capture-sched.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-passthrough-capture.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-passthrough-playback.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-pcm-media.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-processing-playback.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-smart-amplifier-playback.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-src-capture.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-src-playback.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-src-volume-capture.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-src-volume-playback.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-tdfb-capture-16khz.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-tdfb-capture.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-tdfb-eq-iir-volume-capture-16khz.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-tdfb-eq-iir-volume-capture.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-tdfb-playback.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-tdfb-volume-capture-16khz.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-tdfb-volume-capture.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-tone.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-vol-kfbm-capture.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-volume-capture-16khz.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-volume-capture-sched.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-volume-capture.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-volume-demux-playback.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-volume-playback.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-volume-switch-capture.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-waves-codec-demux-playback.m4 (100%) rename tools/topology/{ => topology1}/sof/pipe-waves-codec-playback.m4 (100%) rename tools/topology/{ => topology1}/sof/tokens.m4 (100%) rename tools/{ => topology}/topology2/include/common/route.conf (100%) rename tools/{ => topology}/topology2/include/common/tokens.conf (100%) rename tools/{ => topology}/topology2/include/common/vendor-token.conf (100%) rename tools/{ => topology}/topology2/include/components/asrc.conf (100%) rename tools/{ => topology}/topology2/include/components/buffer.conf (100%) rename tools/{ => topology}/topology2/include/components/dai.conf (100%) rename tools/{ => topology}/topology2/include/components/host.conf (100%) rename tools/{ => topology}/topology2/include/components/pipeline.conf (100%) rename tools/{ => topology}/topology2/include/components/src.conf (100%) rename tools/{ => topology}/topology2/include/components/volume.conf (100%) rename tools/{ => topology}/topology2/include/components/widget-common.conf (100%) rename tools/{ => topology}/topology2/include/controls/common.conf (100%) rename tools/{ => topology}/topology2/include/controls/mixer.conf (100%) diff --git a/tools/test/topology/tplg-build.sh b/tools/test/topology/tplg-build.sh index 9f7bab8222ec..ea78d7217959 100755 --- a/tools/test/topology/tplg-build.sh +++ b/tools/test/topology/tplg-build.sh @@ -13,7 +13,7 @@ rm -f test-*.conf test-*.tplg set -e # M4 preprocessor flags -export M4PATH="../../topology/:../../topology/m4:../../topology/common:../../topology/platform/intel:../../topology/platform/common" +export M4PATH="../../topology/topology1:../../topology/topology1/m4:../../topology/topology1/common:../../topology/topology1/platform/intel:../../topology/topology1/platform/common" if [ -z "$SOF_TPLG_BUILD_OUTPUT" ] then diff --git a/tools/topology/CMakeLists.txt b/tools/topology/CMakeLists.txt index df05433e9d16..b0a844aa489e 100644 --- a/tools/topology/CMakeLists.txt +++ b/tools/topology/CMakeLists.txt @@ -1,213 +1,6 @@ -# SPDX-License-Identifier: BSD-3-Clause - -file(GLOB TPLG_DEPS - platform/intel/*.m4 - platform/common/*.m4 - common/*.m4 - m4/*.m4 - sof/*.m4 -) - -add_custom_target(abi - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/get_abi.sh ${SOF_ROOT_SOURCE_DIRECTORY} - DEPENDS ${TPLG_DEPS} - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - VERBATIM - USES_TERMINAL -) - -set(TPLGS - "sof-cht-nocodec\;sof-cht-nocodec\;-DPLATFORM=cht-nocodec\;-DSSP_NUM=2" - "sof-cht-nocodec\;sof-byt-nocodec\;-DPLATFORM=byt-nocodec\;-DSSP_NUM=2" - "sof-bdw-nocodec\;sof-bdw-nocodec" - "sof-hda-generic\;sof-hda-generic\;-DCHANNELS=0\;-DHSPROC=volume\;-DDYNAMIC=1" - "sof-hda-generic\;sof-hda-generic-1ch\;-DCHANNELS=2\;-DHSPROC=volume\;-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\;sof-hda-generic-2ch\;-DCHANNELS=2\;-DHSPROC=volume\;-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\;sof-hda-generic-3ch\;-DCHANNELS=4\;-DHSPROC=volume\;-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\;sof-hda-generic-4ch\;-DCHANNELS=4\;-DHSPROC=volume\;-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-kwd\;sof-hda-generic-2ch-kwd\;-DCHANNELS=2\;-DDYNAMIC=1" - "sof-hda-generic-kwd\;sof-hda-generic-4ch-kwd\;-DCHANNELS=4\;-DDYNAMIC=1" - "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-keyword-detect\;sof-apl-keyword-detect" - "sof-bdw-codec\;sof-bdw-rt286\;-DCODEC=RT286" - "sof-bdw-codec\;sof-bdw-rt5640\;-DCODEC=RT5640" - "sof-bdw-codec\;sof-bdw-rt5677\;-DCODEC=RT5677" - "sof-byt-codec\;sof-byt-rt5640\;-DCODEC=RT5640\;-DPLATFORM=byt-codec\;-DSSP_NUM=2" - "sof-byt-codec\;sof-byt-rt5645\;-DCODEC=RT5645\;-DPLATFORM=byt-codec\;-DSSP_NUM=2" - "sof-byt-codec\;sof-byt-rt5651\;-DCODEC=RT5651\;-DPLATFORM=byt-codec\;-DSSP_NUM=2" - "sof-byt-codec\;sof-byt-rt5670\;-DCODEC=RT5670\;-DPLATFORM=byt-codec\;-DSSP_NUM=2" - "sof-byt-codec\;sof-byt-rt5682\;-DCODEC=RT5682\;-DPLATFORM=byt-codec\;-DSSP_NUM=2" - "sof-byt-codec\;sof-byt-da7213\;-DCODEC=DA7213\;-DPLATFORM=byt-codec\;-DSSP_NUM=2" - "sof-byt-codec\;sof-byt-cx2072x\;-DCODEC=CX2072X\;-DPLATFORM=byt-codec\;-DSSP_NUM=2" - "sof-byt-codec\;sof-byt-es8316\;-DCODEC=ES8316\;-DPLATFORM=byt-codec\;-DSSP_NUM=2" - "sof-byt-codec\;sof-byt-rt5640-ssp0\;-DCODEC=RT5640\;-DPLATFORM=byt-codec\;-DSSP_NUM=0" - "sof-byt-codec\;sof-byt-rt5645-ssp0\;-DCODEC=RT5645\;-DPLATFORM=byt-codec\;-DSSP_NUM=0" - "sof-byt-codec\;sof-byt-rt5651-ssp0\;-DCODEC=RT5651\;-DPLATFORM=byt-codec\;-DSSP_NUM=0" - "sof-byt-codec\;sof-byt-rt5670-ssp0\;-DCODEC=RT5670\;-DPLATFORM=byt-codec\;-DSSP_NUM=0" - "sof-byt-codec\;sof-byt-rt5682-ssp0\;-DCODEC=RT5682\;-DPLATFORM=byt-codec\;-DSSP_NUM=0" - "sof-byt-codec\;sof-byt-da7213-ssp0\;-DCODEC=DA7213\;-DPLATFORM=byt-codec\;-DSSP_NUM=0" - "sof-byt-codec\;sof-byt-cx2072x-ssp0\;-DCODEC=CX2072X\;-DPLATFORM=byt-codec\;-DSSP_NUM=0" - "sof-byt-codec\;sof-byt-es8316-ssp0\;-DCODEC=ES8316\;-DPLATFORM=byt-codec\;-DSSP_NUM=0" - "sof-byt-codec\;sof-byt-wm5102-ssp0\;-DCODEC=WM5102\;-DPLATFORM=byt-codec\;-DSSP_NUM=0" - "sof-byt-codec\;sof-cht-rt5640\;-DCODEC=RT5640\;-DPLATFORM=cht-codec\;-DSSP_NUM=2" - "sof-byt-codec\;sof-cht-rt5645\;-DCODEC=RT5645\;-DPLATFORM=cht-codec\;-DSSP_NUM=2" - "sof-byt-codec\;sof-cht-rt5651\;-DCODEC=RT5651\;-DPLATFORM=cht-codec\;-DSSP_NUM=2" - "sof-byt-codec\;sof-cht-rt5670\;-DCODEC=RT5670\;-DPLATFORM=cht-codec\;-DSSP_NUM=2" - "sof-byt-codec\;sof-cht-rt5682\;-DCODEC=RT5682\;-DPLATFORM=cht-codec\;-DSSP_NUM=2" - "sof-byt-codec\;sof-cht-da7213\;-DCODEC=DA7213\;-DPLATFORM=cht-codec\;-DSSP_NUM=2" - "sof-byt-codec\;sof-cht-cx2072x\;-DCODEC=CX2072X\;-DPLATFORM=cht-codec\;-DSSP_NUM=2" - "sof-byt-codec\;sof-cht-es8316\;-DCODEC=ES8316\;-DPLATFORM=cht-codec\;-DSSP_NUM=2" - "sof-byt-codec\;sof-cht-nau8824\;-DCODEC=NAU8824\;-DPLATFORM=cht-codec\;-DSSP_NUM=2" - "sof-cht-max98090\;sof-byt-max98090\;-DCODEC=MAX98090\;-DPLATFORM=byt-codec\;-DSSP_NUM=2" - "sof-cht-max98090\;sof-cht-max98090\;-DCODEC=MAX98090\;-DPLATFORM=cht-codec\;-DSSP_NUM=2" - "sof-cnl-rt274\;sof-cnl-rt274" - "sof-apl-tdf8532\;sof-apl-tdf8532" - "sof-apl-pcm512x\;sof-apl-pcm512x\;-DFSYNC=48000" - "sof-apl-pcm512x\;sof-apl-pcm512x-master\;-DCODEC_MASTER\;-DFSYNC=48000" - "sof-apl-pcm512x\;sof-apl-pcm512x-master-44100\;-DCODEC_MASTER\;-DFSYNC=44100" - "sof-apl-demux-pcm512x\;sof-apl-demux-pcm512x" - "sof-apl-rt298\;sof-apl-rt298" - "sof-apl-wm8804\;sof-apl-wm8804" - "sof-apl-da7219\;sof-apl-da7219" - "sof-glk-da7219-kwd\;sof-glk-da7219-kwd\;-DPLATFORM=glk" - "sof-glk-da7219-kwd\;sof-cml-da7219-max98357a\;-DPLATFORM=cml" - "sof-glk-da7219-kwd\;sof-cml-da7219-max98390\;-DCODEC=MAX98390\;-DPLATFORM=cml" - "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\;-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" - "sof-icl-rt700\;sof-icl-rt700-4ch\;-DCHANNELS=4\;-DPLATFORM=icl\;-DDMICPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_48khz.m4\;-DDMIC16KPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_16khz.m4" - "sof-icl-rt700\;sof-icl-rt700-2ch\;-DCHANNELS=2\;-DPLATFORM=icl\;-DDMICPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_48khz.m4\;-DDMIC16KPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_16khz.m4" - # sof-cml-r700 is kept for compatibility with CI and previous versions of the kernel. - "sof-cml-rt700\;sof-cml-rt700\;-DCHANNELS=4\;-DPLATFORM=cml\;-DDMICPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_48khz.m4\;-DDMIC16KPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_16khz.m4" - "sof-cml-rt700\;sof-cml-rt700-4ch\;-DCHANNELS=4\;-DPLATFORM=cml\;-DDMICPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_48khz.m4\;-DDMIC16KPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_16khz.m4" - "sof-cml-rt700\;sof-cml-rt700-2ch\;-DCHANNELS=2\;-DPLATFORM=cml\;-DDMICPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_48khz.m4\;-DDMIC16KPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_16khz.m4" - "sof-icl-rt711-rt1308-rt715-hdmi\;sof-cml-rt711-rt1308-mono-rt715\;-DPLATFORM=cml\;-DMONO" - "sof-icl-rt711-rt1308-rt715-hdmi\;sof-cml-rt711-rt1308-rt715\;-DPLATFORM=cml" - "sof-icl-rt711-rt1308-rt715-hdmi\;sof-icl-rt711-rt1308-rt715\;-DPLATFORM=icl" - "sof-icl-rt711-rt1308-rt715-hdmi\;sof-tgl-rt711-rt1308-mono-rt715\;-DPLATFORM=tgl\;-DMONO\;-DUAJ_LINK=0\;-DAMP_1_LINK=1\;-DMIC_LINK=3" - "sof-icl-rt711-rt1308-rt715-hdmi\;sof-tgl-rt715-rt711-rt1308-mono\;-DPLATFORM=tgl\;-DMONO\;-DUAJ_LINK=1\;-DAMP_1_LINK=2\;-DMIC_LINK=0" - "sof-icl-rt711-rt1308-rt715-hdmi\;sof-tgl-rt711-rt1308-rt715\;-DPLATFORM=tgl\;-DUAJ_LINK=0\;-DAMP_1_LINK=1\;-DAMP_2_LINK=2\;-DMIC_LINK=3" - "sof-icl-rt711-rt1308-rt715-hdmi\;sof-tgl-rt711-rt1316-rt714\;-DPLATFORM=tgl\;-DUAJ_LINK=0\;-DAMP_1_LINK=1\;-DAMP_2_LINK=2\;-DMIC_LINK=3" - "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt711-l0-rt1308-l12-rt715-l3\;-DPLATFORM=adl\;-DUAJ_LINK=0\;-DAMP_1_LINK=1\;-DAMP_2_LINK=2\;-DMIC_LINK=3" - "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt711-l0-rt1316-l12-rt714-l3\;-DPLATFORM=adl\;-DUAJ_LINK=0\;-DAMP_1_LINK=1\;-DAMP_2_LINK=2\;-DMIC_LINK=3" - "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt711-l0-rt1316-l13-rt714-l2\;-DPLATFORM=adl\;-DUAJ_LINK=0\;-DAMP_1_LINK=1\;-DAMP_2_LINK=3\;-DMIC_LINK=2" - "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt1316-l2-mono-rt714-link0\;-DPLATFORM=adl\;-DMONO\;-DNOJACK\;-DAMP_1_LINK=2\;-DMIC_LINK=0" - "sof-cnl-rt5682-sdw2\;sof-cnl-rt5682-sdw2\;-DPLATFORM=cnl" - "sof-cml-rt5682\;sof-cml-rt5682\;-DPLATFORM=cml\;-DDMICPROC=eq-iir-volume\;-DDMIC16KPROC=eq-iir-volume" - "sof-cml-rt5682\;sof-whl-rt5682\;-DPLATFORM=whl\;-DDMICPROC=eq-iir-volume\;-DDMIC16KPROC=eq-iir-volume" - "sof-cml-rt5682\;sof-icl-rt5682\;-DPLATFORM=icl\;-DDMICPROC=eq-iir-volume\;-DDMIC16KPROC=eq-iir-volume" - "sof-cml-rt5682-kwd\;sof-cml-rt5682-kwd\;-DPLATFORM=cml" - "sof-cml-rt5682-kwd\;sof-whl-rt5682-kwd\;-DPLATFORM=whl" - "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\;-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" - "sof-tgl-nocodec\;sof-tgl-nocodec" - "sof-tgl-rt711-rt1308\;sof-tgl-rt711-rt1308-2ch\;-DCHANNELS=2\;-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-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\;-DDYNAMIC=1" - "sof-ehl-rt5660\;sof-ehl-rt5660\;-DHDMI=1" - "sof-ehl-rt5660\;sof-ehl-rt5660-nohdmi" - "sof-imx8-nocodec\;sof-imx8-nocodec" - "sof-imx8-cs42888\;sof-imx8-cs42888" - "sof-imx8-nocodec-sai\;sof-imx8-nocodec-sai" - "sof-imx8-wm8960\;sof-imx8-wm8960" - "sof-imx8-wm8960-mixer\;sof-imx8-wm8960-mixer" - "sof-imx8-wm8960-kwd\;sof-imx8-wm8960-kwd" - "sof-imx8-cs42888-mixer\;sof-imx8-cs42888-mixer" - "sof-imx8mp-wm8960-mixer\;sof-imx8mp-wm8960-mixer" - "sof-imx8mp-wm8960-kwd\;sof-imx8mp-wm8960-kwd" - "sof-tgl-max98357a-rt5682\;sof-tgl-max98357a-rt5682\;-DCODEC=MAX98357A\;-DFMT=s16le" - "sof-tgl-max98357a-rt5682\;sof-tgl-max98357a-rt5682-pdm1\;-DCODEC=MAX98357A\;-DFMT=s16le\;-DDMIC_DAI_LINK_16k_PDM=STEREO_PDM1" - "sof-tgl-max98357a-rt5682\;sof-tgl-max98357a-rt5682-pdm1-drceq\;-DCODEC=MAX98357A\;-DFMT=s16le\;-DDMIC_DAI_LINK_16k_PDM=STEREO_PDM1\;-DDRC_EQ" - "sof-tgl-max98357a-rt5682\;sof-tgl-rt1011-rt5682\;-DCODEC=RT1011\;-DFMT=s24le" - "sof-tgl-max98373-rt5682\;sof-tgl-max98373-rt5682\;-DAMP_SSP=1" - "sof-tgl-max98373-rt5682\;sof-tgl-max98373-rt5682-igonr\;-DAMP_SSP=1\;-DIGO" - "sof-tgl-max98373-rt5682\;sof-tgl-max98373-rt5682-xperi\;-DAMP_SSP=1\;-DINCLUDE_IIR_EQ=1" - "sof-tgl-max98373-rt5682\;sof-tgl-rt5682-ssp0-max98373-ssp2\;-DAMP_SSP=2" - "sof-tgl-max98373-rt5682\;sof-tgl-rt5682-ssp0-max98373-ssp2-xperi\;-DAMP_SSP=2\;-DINCLUDE_IIR_EQ=1" - "sof-tgl-sdw-max98373-rt5682\;sof-tgl-sdw-max98373-rt5682\;-DCHANNELS=4\;-DPLATFORM=tgl" - "sof-tgl-sdw-max98373-rt5682\;sof-adl-sdw-max98373-rt5682\;-DCHANNELS=4\;-DPLATFORM=adl" - "sof-jsl-da7219\;sof-jsl-da7219\;-DPLATFORM=jsl" - "sof-jsl-da7219\;sof-jsl-da7219-mx98360a\;-DPLATFORM=jsl-dedede" - "sof-imx8mp-wm8960\;sof-imx8mp-wm8960" - "sof-smart-amplifier-nocodec\;sof-smart-amplifier-nocodec" - "sof-jsl-rt5682\;sof-jsl-rt5682-rt1015\;-DPLATFORM=jsl-rt1015" - "sof-jsl-rt5682\;sof-jsl-rt5682-rt1015-xperi\;-DPLATFORM=jsl-rt1015\;-DINCLUDE_IIR_EQ=1" - "sof-jsl-rt5682\;sof-jsl-rt5682-mx98360a\;-DPLATFORM=jsl-dedede" -) +set(SOF_TOPOLOGY_BINARY_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") add_custom_target(topologies ALL) +add_dependencies(topologies topologies1) -foreach(tplg ${TPLGS}) - list(GET tplg 0 input) - list(GET tplg 1 output) - list(LENGTH tplg tplg_len) - math(EXPR num_args "${tplg_len} - 1") - set(DEFINES "") - if (${num_args} GREATER 1) - foreach(index RANGE 2 ${num_args}) - list(GET tplg ${index} custom_define) - list(APPEND DEFINES ${custom_define}) - endforeach() - endif() - - add_custom_command( - OUTPUT ${output}.conf - COMMAND m4 --fatal-warnings - ${DEFINES} - -I ${CMAKE_CURRENT_SOURCE_DIR}/m4 - -I ${CMAKE_CURRENT_SOURCE_DIR}/common - -I ${CMAKE_CURRENT_SOURCE_DIR}/platform/common - -I ${CMAKE_CURRENT_SOURCE_DIR} - -I ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/common/abi.m4 - ${CMAKE_CURRENT_SOURCE_DIR}/${input}.m4 - > ${output}.conf - MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/${input}.m4 - DEPENDS abi - VERBATIM - USES_TERMINAL - ) - -# This use of VERBOSE relies on original CMake behavior. -# From the add_custom_command() manual: -# -# Use of VERBATIM is recommended as it enables correct behavior. -# When VERBATIM is not given the behavior is platform specific because -# there is no protection of tool-specific special characters. -# -# This is fine because: -# - We don't expect alsatplg to work on Windows any time soon. -# - CMake is too afraid to remove the original, no-VERBATIM behavior: -# https://gitlab.kitware.com/cmake/cmake/issues/18849 -# -# Also note that in alsa-utils commit v1.2.2~15-gcbabe7a3f0cc, alsatplg -# (accidentally?) started ignoring the verbosity level, now it's just -# verbose or not. - add_custom_command( - OUTPUT ${output}.tplg - COMMAND alsatplg \$\${VERBOSE:+-v 1} -c ${output}.conf -o ${output}.tplg - MAIN_DEPENDENCY ${output}.conf - USES_TERMINAL - ) - - add_custom_target(topology_${output} DEPENDS ${output}.tplg) - add_dependencies(topologies topology_${output}) -endforeach() - -add_subdirectory(development) -add_subdirectory(dsp_enhancement) +add_subdirectory(topology1) diff --git a/tools/topology/topology1/CMakeLists.txt b/tools/topology/topology1/CMakeLists.txt new file mode 100644 index 000000000000..8f6d3ea41b97 --- /dev/null +++ b/tools/topology/topology1/CMakeLists.txt @@ -0,0 +1,214 @@ +# SPDX-License-Identifier: BSD-3-Clause + +file(GLOB TPLG_DEPS + platform/intel/*.m4 + platform/common/*.m4 + common/*.m4 + m4/*.m4 + sof/*.m4 +) + +add_custom_target(abi_v1 + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/get_abi.sh ${SOF_ROOT_SOURCE_DIRECTORY} + DEPENDS ${TPLG_DEPS} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + VERBATIM + USES_TERMINAL +) + +set(TPLGS + "sof-cht-nocodec\;sof-cht-nocodec\;-DPLATFORM=cht-nocodec\;-DSSP_NUM=2" + "sof-cht-nocodec\;sof-byt-nocodec\;-DPLATFORM=byt-nocodec\;-DSSP_NUM=2" + "sof-bdw-nocodec\;sof-bdw-nocodec" + "sof-hda-generic\;sof-hda-generic\;-DCHANNELS=0\;-DHSPROC=volume\;-DDYNAMIC=1" + "sof-hda-generic\;sof-hda-generic-1ch\;-DCHANNELS=2\;-DHSPROC=volume\;-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\;sof-hda-generic-2ch\;-DCHANNELS=2\;-DHSPROC=volume\;-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\;sof-hda-generic-3ch\;-DCHANNELS=4\;-DHSPROC=volume\;-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\;sof-hda-generic-4ch\;-DCHANNELS=4\;-DHSPROC=volume\;-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-kwd\;sof-hda-generic-2ch-kwd\;-DCHANNELS=2\;-DDYNAMIC=1" + "sof-hda-generic-kwd\;sof-hda-generic-4ch-kwd\;-DCHANNELS=4\;-DDYNAMIC=1" + "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-keyword-detect\;sof-apl-keyword-detect" + "sof-bdw-codec\;sof-bdw-rt286\;-DCODEC=RT286" + "sof-bdw-codec\;sof-bdw-rt5640\;-DCODEC=RT5640" + "sof-bdw-codec\;sof-bdw-rt5677\;-DCODEC=RT5677" + "sof-byt-codec\;sof-byt-rt5640\;-DCODEC=RT5640\;-DPLATFORM=byt-codec\;-DSSP_NUM=2" + "sof-byt-codec\;sof-byt-rt5645\;-DCODEC=RT5645\;-DPLATFORM=byt-codec\;-DSSP_NUM=2" + "sof-byt-codec\;sof-byt-rt5651\;-DCODEC=RT5651\;-DPLATFORM=byt-codec\;-DSSP_NUM=2" + "sof-byt-codec\;sof-byt-rt5670\;-DCODEC=RT5670\;-DPLATFORM=byt-codec\;-DSSP_NUM=2" + "sof-byt-codec\;sof-byt-rt5682\;-DCODEC=RT5682\;-DPLATFORM=byt-codec\;-DSSP_NUM=2" + "sof-byt-codec\;sof-byt-da7213\;-DCODEC=DA7213\;-DPLATFORM=byt-codec\;-DSSP_NUM=2" + "sof-byt-codec\;sof-byt-cx2072x\;-DCODEC=CX2072X\;-DPLATFORM=byt-codec\;-DSSP_NUM=2" + "sof-byt-codec\;sof-byt-es8316\;-DCODEC=ES8316\;-DPLATFORM=byt-codec\;-DSSP_NUM=2" + "sof-byt-codec\;sof-byt-rt5640-ssp0\;-DCODEC=RT5640\;-DPLATFORM=byt-codec\;-DSSP_NUM=0" + "sof-byt-codec\;sof-byt-rt5645-ssp0\;-DCODEC=RT5645\;-DPLATFORM=byt-codec\;-DSSP_NUM=0" + "sof-byt-codec\;sof-byt-rt5651-ssp0\;-DCODEC=RT5651\;-DPLATFORM=byt-codec\;-DSSP_NUM=0" + "sof-byt-codec\;sof-byt-rt5670-ssp0\;-DCODEC=RT5670\;-DPLATFORM=byt-codec\;-DSSP_NUM=0" + "sof-byt-codec\;sof-byt-rt5682-ssp0\;-DCODEC=RT5682\;-DPLATFORM=byt-codec\;-DSSP_NUM=0" + "sof-byt-codec\;sof-byt-da7213-ssp0\;-DCODEC=DA7213\;-DPLATFORM=byt-codec\;-DSSP_NUM=0" + "sof-byt-codec\;sof-byt-cx2072x-ssp0\;-DCODEC=CX2072X\;-DPLATFORM=byt-codec\;-DSSP_NUM=0" + "sof-byt-codec\;sof-byt-es8316-ssp0\;-DCODEC=ES8316\;-DPLATFORM=byt-codec\;-DSSP_NUM=0" + "sof-byt-codec\;sof-byt-wm5102-ssp0\;-DCODEC=WM5102\;-DPLATFORM=byt-codec\;-DSSP_NUM=0" + "sof-byt-codec\;sof-cht-rt5640\;-DCODEC=RT5640\;-DPLATFORM=cht-codec\;-DSSP_NUM=2" + "sof-byt-codec\;sof-cht-rt5645\;-DCODEC=RT5645\;-DPLATFORM=cht-codec\;-DSSP_NUM=2" + "sof-byt-codec\;sof-cht-rt5651\;-DCODEC=RT5651\;-DPLATFORM=cht-codec\;-DSSP_NUM=2" + "sof-byt-codec\;sof-cht-rt5670\;-DCODEC=RT5670\;-DPLATFORM=cht-codec\;-DSSP_NUM=2" + "sof-byt-codec\;sof-cht-rt5682\;-DCODEC=RT5682\;-DPLATFORM=cht-codec\;-DSSP_NUM=2" + "sof-byt-codec\;sof-cht-da7213\;-DCODEC=DA7213\;-DPLATFORM=cht-codec\;-DSSP_NUM=2" + "sof-byt-codec\;sof-cht-cx2072x\;-DCODEC=CX2072X\;-DPLATFORM=cht-codec\;-DSSP_NUM=2" + "sof-byt-codec\;sof-cht-es8316\;-DCODEC=ES8316\;-DPLATFORM=cht-codec\;-DSSP_NUM=2" + "sof-byt-codec\;sof-cht-nau8824\;-DCODEC=NAU8824\;-DPLATFORM=cht-codec\;-DSSP_NUM=2" + "sof-cht-max98090\;sof-byt-max98090\;-DCODEC=MAX98090\;-DPLATFORM=byt-codec\;-DSSP_NUM=2" + "sof-cht-max98090\;sof-cht-max98090\;-DCODEC=MAX98090\;-DPLATFORM=cht-codec\;-DSSP_NUM=2" + "sof-cnl-rt274\;sof-cnl-rt274" + "sof-apl-tdf8532\;sof-apl-tdf8532" + "sof-apl-pcm512x\;sof-apl-pcm512x\;-DFSYNC=48000" + "sof-apl-pcm512x\;sof-apl-pcm512x-master\;-DCODEC_MASTER\;-DFSYNC=48000" + "sof-apl-pcm512x\;sof-apl-pcm512x-master-44100\;-DCODEC_MASTER\;-DFSYNC=44100" + "sof-apl-demux-pcm512x\;sof-apl-demux-pcm512x" + "sof-apl-rt298\;sof-apl-rt298" + "sof-apl-wm8804\;sof-apl-wm8804" + "sof-apl-da7219\;sof-apl-da7219" + "sof-glk-da7219-kwd\;sof-glk-da7219-kwd\;-DPLATFORM=glk" + "sof-glk-da7219-kwd\;sof-cml-da7219-max98357a\;-DPLATFORM=cml" + "sof-glk-da7219-kwd\;sof-cml-da7219-max98390\;-DCODEC=MAX98390\;-DPLATFORM=cml" + "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\;-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" + "sof-icl-rt700\;sof-icl-rt700-4ch\;-DCHANNELS=4\;-DPLATFORM=icl\;-DDMICPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_48khz.m4\;-DDMIC16KPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_16khz.m4" + "sof-icl-rt700\;sof-icl-rt700-2ch\;-DCHANNELS=2\;-DPLATFORM=icl\;-DDMICPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_48khz.m4\;-DDMIC16KPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_16khz.m4" + # sof-cml-r700 is kept for compatibility with CI and previous versions of the kernel. + "sof-cml-rt700\;sof-cml-rt700\;-DCHANNELS=4\;-DPLATFORM=cml\;-DDMICPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_48khz.m4\;-DDMIC16KPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_16khz.m4" + "sof-cml-rt700\;sof-cml-rt700-4ch\;-DCHANNELS=4\;-DPLATFORM=cml\;-DDMICPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_48khz.m4\;-DDMIC16KPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_16khz.m4" + "sof-cml-rt700\;sof-cml-rt700-2ch\;-DCHANNELS=2\;-DPLATFORM=cml\;-DDMICPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_48khz.m4\;-DDMIC16KPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_16khz.m4" + "sof-icl-rt711-rt1308-rt715-hdmi\;sof-cml-rt711-rt1308-mono-rt715\;-DPLATFORM=cml\;-DMONO" + "sof-icl-rt711-rt1308-rt715-hdmi\;sof-cml-rt711-rt1308-rt715\;-DPLATFORM=cml" + "sof-icl-rt711-rt1308-rt715-hdmi\;sof-icl-rt711-rt1308-rt715\;-DPLATFORM=icl" + "sof-icl-rt711-rt1308-rt715-hdmi\;sof-tgl-rt711-rt1308-mono-rt715\;-DPLATFORM=tgl\;-DMONO\;-DUAJ_LINK=0\;-DAMP_1_LINK=1\;-DMIC_LINK=3" + "sof-icl-rt711-rt1308-rt715-hdmi\;sof-tgl-rt715-rt711-rt1308-mono\;-DPLATFORM=tgl\;-DMONO\;-DUAJ_LINK=1\;-DAMP_1_LINK=2\;-DMIC_LINK=0" + "sof-icl-rt711-rt1308-rt715-hdmi\;sof-tgl-rt711-rt1308-rt715\;-DPLATFORM=tgl\;-DUAJ_LINK=0\;-DAMP_1_LINK=1\;-DAMP_2_LINK=2\;-DMIC_LINK=3" + "sof-icl-rt711-rt1308-rt715-hdmi\;sof-tgl-rt711-rt1316-rt714\;-DPLATFORM=tgl\;-DUAJ_LINK=0\;-DAMP_1_LINK=1\;-DAMP_2_LINK=2\;-DMIC_LINK=3" + "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt711-l0-rt1308-l12-rt715-l3\;-DPLATFORM=adl\;-DUAJ_LINK=0\;-DAMP_1_LINK=1\;-DAMP_2_LINK=2\;-DMIC_LINK=3" + "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt711-l0-rt1316-l12-rt714-l3\;-DPLATFORM=adl\;-DUAJ_LINK=0\;-DAMP_1_LINK=1\;-DAMP_2_LINK=2\;-DMIC_LINK=3" + "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt711-l0-rt1316-l13-rt714-l2\;-DPLATFORM=adl\;-DUAJ_LINK=0\;-DAMP_1_LINK=1\;-DAMP_2_LINK=3\;-DMIC_LINK=2" + "sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt1316-l2-mono-rt714-link0\;-DPLATFORM=adl\;-DMONO\;-DNOJACK\;-DAMP_1_LINK=2\;-DMIC_LINK=0" + "sof-cnl-rt5682-sdw2\;sof-cnl-rt5682-sdw2\;-DPLATFORM=cnl" + "sof-cml-rt5682\;sof-cml-rt5682\;-DPLATFORM=cml\;-DDMICPROC=eq-iir-volume\;-DDMIC16KPROC=eq-iir-volume" + "sof-cml-rt5682\;sof-whl-rt5682\;-DPLATFORM=whl\;-DDMICPROC=eq-iir-volume\;-DDMIC16KPROC=eq-iir-volume" + "sof-cml-rt5682\;sof-icl-rt5682\;-DPLATFORM=icl\;-DDMICPROC=eq-iir-volume\;-DDMIC16KPROC=eq-iir-volume" + "sof-cml-rt5682-kwd\;sof-cml-rt5682-kwd\;-DPLATFORM=cml" + "sof-cml-rt5682-kwd\;sof-whl-rt5682-kwd\;-DPLATFORM=whl" + "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\;-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" + "sof-tgl-nocodec\;sof-tgl-nocodec" + "sof-tgl-rt711-rt1308\;sof-tgl-rt711-rt1308-2ch\;-DCHANNELS=2\;-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-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\;-DDYNAMIC=1" + "sof-ehl-rt5660\;sof-ehl-rt5660\;-DHDMI=1" + "sof-ehl-rt5660\;sof-ehl-rt5660-nohdmi" + "sof-imx8-nocodec\;sof-imx8-nocodec" + "sof-imx8-cs42888\;sof-imx8-cs42888" + "sof-imx8-nocodec-sai\;sof-imx8-nocodec-sai" + "sof-imx8-wm8960\;sof-imx8-wm8960" + "sof-imx8-wm8960-mixer\;sof-imx8-wm8960-mixer" + "sof-imx8-wm8960-kwd\;sof-imx8-wm8960-kwd" + "sof-imx8-cs42888-mixer\;sof-imx8-cs42888-mixer" + "sof-imx8mp-wm8960-mixer\;sof-imx8mp-wm8960-mixer" + "sof-imx8mp-wm8960-kwd\;sof-imx8mp-wm8960-kwd" + "sof-tgl-max98357a-rt5682\;sof-tgl-max98357a-rt5682\;-DCODEC=MAX98357A\;-DFMT=s16le" + "sof-tgl-max98357a-rt5682\;sof-tgl-max98357a-rt5682-pdm1\;-DCODEC=MAX98357A\;-DFMT=s16le\;-DDMIC_DAI_LINK_16k_PDM=STEREO_PDM1" + "sof-tgl-max98357a-rt5682\;sof-tgl-rt1011-rt5682\;-DCODEC=RT1011\;-DFMT=s24le" + "sof-tgl-max98373-rt5682\;sof-tgl-max98373-rt5682\;-DAMP_SSP=1" + "sof-tgl-max98373-rt5682\;sof-tgl-max98373-rt5682-igonr\;-DAMP_SSP=1\;-DIGO" + "sof-tgl-max98373-rt5682\;sof-tgl-max98373-rt5682-xperi\;-DAMP_SSP=1\;-DINCLUDE_IIR_EQ=1" + "sof-tgl-max98373-rt5682\;sof-tgl-rt5682-ssp0-max98373-ssp2\;-DAMP_SSP=2" + "sof-tgl-max98373-rt5682\;sof-tgl-rt5682-ssp0-max98373-ssp2-xperi\;-DAMP_SSP=2\;-DINCLUDE_IIR_EQ=1" + "sof-tgl-sdw-max98373-rt5682\;sof-tgl-sdw-max98373-rt5682\;-DCHANNELS=4\;-DPLATFORM=tgl" + "sof-tgl-sdw-max98373-rt5682\;sof-adl-sdw-max98373-rt5682\;-DCHANNELS=4\;-DPLATFORM=adl" + "sof-jsl-da7219\;sof-jsl-da7219\;-DPLATFORM=jsl" + "sof-jsl-da7219\;sof-jsl-da7219-mx98360a\;-DPLATFORM=jsl-dedede" + "sof-imx8mp-wm8960\;sof-imx8mp-wm8960" + "sof-smart-amplifier-nocodec\;sof-smart-amplifier-nocodec" + "sof-jsl-rt5682\;sof-jsl-rt5682-rt1015\;-DPLATFORM=jsl-rt1015" + "sof-jsl-rt5682\;sof-jsl-rt5682-rt1015-xperi\;-DPLATFORM=jsl-rt1015\;-DINCLUDE_IIR_EQ=1" + "sof-jsl-rt5682\;sof-jsl-rt5682-mx98360a\;-DPLATFORM=jsl-dedede" +) + +add_custom_target(topologies1 ALL + COMMAND ${CMAKE_COMMAND} -E copy_directory . ${SOF_TOPOLOGY_BINARY_DIRECTORY} +) + +foreach(tplg ${TPLGS}) + list(GET tplg 0 input) + list(GET tplg 1 output) + list(LENGTH tplg tplg_len) + math(EXPR num_args "${tplg_len} - 1") + set(DEFINES "") + if (${num_args} GREATER 1) + foreach(index RANGE 2 ${num_args}) + list(GET tplg ${index} custom_define) + list(APPEND DEFINES ${custom_define}) + endforeach() + endif() + + add_custom_command( + OUTPUT ${output}.conf + COMMAND m4 --fatal-warnings + ${DEFINES} + -I ${CMAKE_CURRENT_SOURCE_DIR}/m4 + -I ${CMAKE_CURRENT_SOURCE_DIR}/common + -I ${CMAKE_CURRENT_SOURCE_DIR}/platform/common + -I ${CMAKE_CURRENT_SOURCE_DIR} + -I ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/common/abi.m4 + ${CMAKE_CURRENT_SOURCE_DIR}/${input}.m4 + > ${output}.conf + MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/${input}.m4 + DEPENDS abi_v1 + VERBATIM + USES_TERMINAL + ) + +# This use of VERBOSE relies on original CMake behavior. +# From the add_custom_command() manual: +# +# Use of VERBATIM is recommended as it enables correct behavior. +# When VERBATIM is not given the behavior is platform specific because +# there is no protection of tool-specific special characters. +# +# This is fine because: +# - We don't expect alsatplg to work on Windows any time soon. +# - CMake is too afraid to remove the original, no-VERBATIM behavior: +# https://gitlab.kitware.com/cmake/cmake/issues/18849 +# +# Also note that in alsa-utils commit v1.2.2~15-gcbabe7a3f0cc, alsatplg +# (accidentally?) started ignoring the verbosity level, now it's just +# verbose or not. + add_custom_command( + OUTPUT ${output}.tplg + COMMAND alsatplg \$\${VERBOSE:+-v 1} -c ${CMAKE_CURRENT_BINARY_DIR}/${output}.conf -o ${output}.tplg + MAIN_DEPENDENCY ${output}.conf + USES_TERMINAL + ) + + add_custom_target(topology1_${output} DEPENDS ${output}.tplg) + add_dependencies(topologies1 topology1_${output}) +endforeach() + +add_subdirectory(development) +add_subdirectory(dsp_enhancement) diff --git a/tools/topology/common/abi.m4 b/tools/topology/topology1/common/abi.m4 similarity index 100% rename from tools/topology/common/abi.m4 rename to tools/topology/topology1/common/abi.m4 diff --git a/tools/topology/common/memory.m4 b/tools/topology/topology1/common/memory.m4 similarity index 100% rename from tools/topology/common/memory.m4 rename to tools/topology/topology1/common/memory.m4 diff --git a/tools/topology/common/tlv.m4 b/tools/topology/topology1/common/tlv.m4 similarity index 100% rename from tools/topology/common/tlv.m4 rename to tools/topology/topology1/common/tlv.m4 diff --git a/tools/topology/development/CMakeLists.txt b/tools/topology/topology1/development/CMakeLists.txt similarity index 97% rename from tools/topology/development/CMakeLists.txt rename to tools/topology/topology1/development/CMakeLists.txt index fb779587f102..bcfc92ea2c20 100644 --- a/tools/topology/development/CMakeLists.txt +++ b/tools/topology/topology1/development/CMakeLists.txt @@ -34,7 +34,7 @@ set(TPLGS_UP "sof-hda-generic\;sof-hda-generic-tdfb_50mm-2ch\;-DCHANNELS=2\;-DHSPROC=volume\;-DDMIC16KPROC=tdfb-eq-iir-volume\;-DDMIC16KPROC_FILTER1=tdfb/coef_line2_50mm_pm10deg_16khz.m4\;-DDMICPROC=tdfb-eq-iir-volume\;-DDMICPROC_FILTER1=tdfb/coef_line2_50mm_pm10deg_48khz.m4\;-DDMICPROC_FILTER2=eq_iir_coef_highpass_40hz_20db_48khz.m4\;-DDMIC16KPROC_FILTER2=eq_iir_coef_highpass_40hz_20db_16khz.m4" ) -add_custom_target(dev_topologies ALL) +add_custom_target(dev_topologies1 ALL) foreach(tplg ${TPLGS}) list(GET tplg 0 input) @@ -61,7 +61,7 @@ foreach(tplg ${TPLGS}) ${CMAKE_CURRENT_SOURCE_DIR}/../common/abi.m4 ${CMAKE_CURRENT_SOURCE_DIR}/${input}.m4 > ${output}.conf - DEPENDS abi + DEPENDS abi_v1 VERBATIM USES_TERMINAL ) @@ -89,7 +89,7 @@ foreach(tplg ${TPLGS}) ) add_custom_target(topology_${output} DEPENDS ${output}.tplg) - add_dependencies(dev_topologies topology_${output}) + add_dependencies(dev_topologies1 topology_${output}) endforeach() # Duplicate of above to handle topologies in parent directory @@ -117,7 +117,7 @@ foreach(tplg ${TPLGS_UP}) ${CMAKE_CURRENT_SOURCE_DIR}/../common/abi.m4 ${CMAKE_CURRENT_SOURCE_DIR}/../${input}.m4 > ${output}.conf - DEPENDS abi + DEPENDS abi_v1 VERBATIM USES_TERMINAL ) @@ -129,5 +129,5 @@ foreach(tplg ${TPLGS_UP}) ) add_custom_target(topology_${output} DEPENDS ${output}.tplg) - add_dependencies(dev_topologies topology_${output}) + add_dependencies(dev_topologies1 topology_${output}) endforeach() diff --git a/tools/topology/development/sof-apl-asrc-pcm512x.m4 b/tools/topology/topology1/development/sof-apl-asrc-pcm512x.m4 similarity index 100% rename from tools/topology/development/sof-apl-asrc-pcm512x.m4 rename to tools/topology/topology1/development/sof-apl-asrc-pcm512x.m4 diff --git a/tools/topology/development/sof-apl-asrc-wm8804.m4 b/tools/topology/topology1/development/sof-apl-asrc-wm8804.m4 similarity index 100% rename from tools/topology/development/sof-apl-asrc-wm8804.m4 rename to tools/topology/topology1/development/sof-apl-asrc-wm8804.m4 diff --git a/tools/topology/development/sof-apl-dmic-a96k-b16k.m4 b/tools/topology/topology1/development/sof-apl-dmic-a96k-b16k.m4 similarity index 100% rename from tools/topology/development/sof-apl-dmic-a96k-b16k.m4 rename to tools/topology/topology1/development/sof-apl-dmic-a96k-b16k.m4 diff --git a/tools/topology/development/sof-apl-dmic-asymmetric.m4 b/tools/topology/topology1/development/sof-apl-dmic-asymmetric.m4 similarity index 100% rename from tools/topology/development/sof-apl-dmic-asymmetric.m4 rename to tools/topology/topology1/development/sof-apl-dmic-asymmetric.m4 diff --git a/tools/topology/development/sof-apl-dmic.m4 b/tools/topology/topology1/development/sof-apl-dmic.m4 similarity index 100% rename from tools/topology/development/sof-apl-dmic.m4 rename to tools/topology/topology1/development/sof-apl-dmic.m4 diff --git a/tools/topology/development/sof-apl-pcm512x-nohdmi.m4 b/tools/topology/topology1/development/sof-apl-pcm512x-nohdmi.m4 similarity index 100% rename from tools/topology/development/sof-apl-pcm512x-nohdmi.m4 rename to tools/topology/topology1/development/sof-apl-pcm512x-nohdmi.m4 diff --git a/tools/topology/development/sof-apl-src-50khz-pcm512x.m4 b/tools/topology/topology1/development/sof-apl-src-50khz-pcm512x.m4 similarity index 100% rename from tools/topology/development/sof-apl-src-50khz-pcm512x.m4 rename to tools/topology/topology1/development/sof-apl-src-50khz-pcm512x.m4 diff --git a/tools/topology/development/sof-cml-rt1011-rt5682-nokwd.m4 b/tools/topology/topology1/development/sof-cml-rt1011-rt5682-nokwd.m4 similarity index 100% rename from tools/topology/development/sof-cml-rt1011-rt5682-nokwd.m4 rename to tools/topology/topology1/development/sof-cml-rt1011-rt5682-nokwd.m4 diff --git a/tools/topology/development/sof-cml-src-rt5682.m4 b/tools/topology/topology1/development/sof-cml-src-rt5682.m4 similarity index 100% rename from tools/topology/development/sof-cml-src-rt5682.m4 rename to tools/topology/topology1/development/sof-cml-src-rt5682.m4 diff --git a/tools/topology/development/sof-hda-asrc.m4 b/tools/topology/topology1/development/sof-hda-asrc.m4 similarity index 100% rename from tools/topology/development/sof-hda-asrc.m4 rename to tools/topology/topology1/development/sof-hda-asrc.m4 diff --git a/tools/topology/development/sof-imx8-src-cs42888.m4 b/tools/topology/topology1/development/sof-imx8-src-cs42888.m4 similarity index 100% rename from tools/topology/development/sof-imx8-src-cs42888.m4 rename to tools/topology/topology1/development/sof-imx8-src-cs42888.m4 diff --git a/tools/topology/development/sof-imx8-src-wm8960.m4 b/tools/topology/topology1/development/sof-imx8-src-wm8960.m4 similarity index 100% rename from tools/topology/development/sof-imx8-src-wm8960.m4 rename to tools/topology/topology1/development/sof-imx8-src-wm8960.m4 diff --git a/tools/topology/development/sof-imx8mp-src-wm8960.m4 b/tools/topology/topology1/development/sof-imx8mp-src-wm8960.m4 similarity index 100% rename from tools/topology/development/sof-imx8mp-src-wm8960.m4 rename to tools/topology/topology1/development/sof-imx8mp-src-wm8960.m4 diff --git a/tools/topology/development/sof-tgl-nocodec-ci.m4 b/tools/topology/topology1/development/sof-tgl-nocodec-ci.m4 similarity index 100% rename from tools/topology/development/sof-tgl-nocodec-ci.m4 rename to tools/topology/topology1/development/sof-tgl-nocodec-ci.m4 diff --git a/tools/topology/dsp_enhancement/CMakeLists.txt b/tools/topology/topology1/dsp_enhancement/CMakeLists.txt similarity index 95% rename from tools/topology/dsp_enhancement/CMakeLists.txt rename to tools/topology/topology1/dsp_enhancement/CMakeLists.txt index 16707aa7e004..42af1acc13e3 100644 --- a/tools/topology/dsp_enhancement/CMakeLists.txt +++ b/tools/topology/topology1/dsp_enhancement/CMakeLists.txt @@ -7,7 +7,7 @@ set(TPLGS_UP "sof-hda-generic\;sof-hda-generic-eq-4ch\;-DCHANNELS=4\;-DHSPROC=eq-iir-eq-fir-volume\;-DDMICPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_48khz.m4\;-DDMIC16KPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_16khz.m4" ) -add_custom_target(dsp_topologies ALL) +add_custom_target(dsp_topologies1 ALL) foreach(tplg ${TPLGS_UP}) list(GET tplg 0 input) @@ -34,7 +34,7 @@ foreach(tplg ${TPLGS_UP}) ${CMAKE_CURRENT_SOURCE_DIR}/../common/abi.m4 ${CMAKE_CURRENT_SOURCE_DIR}/../${input}.m4 > ${output}.conf - DEPENDS abi + DEPENDS abi_v1 VERBATIM USES_TERMINAL ) @@ -62,5 +62,5 @@ foreach(tplg ${TPLGS_UP}) ) add_custom_target(topology_${output} DEPENDS ${output}.tplg) - add_dependencies(dsp_topologies topology_${output}) + add_dependencies(dsp_topologies1 topology_${output}) endforeach() diff --git a/tools/topology/get_abi.sh b/tools/topology/topology1/get_abi.sh similarity index 100% rename from tools/topology/get_abi.sh rename to tools/topology/topology1/get_abi.sh diff --git a/tools/topology/m4/asrc.m4 b/tools/topology/topology1/m4/asrc.m4 similarity index 100% rename from tools/topology/m4/asrc.m4 rename to tools/topology/topology1/m4/asrc.m4 diff --git a/tools/topology/m4/buffer.m4 b/tools/topology/topology1/m4/buffer.m4 similarity index 100% rename from tools/topology/m4/buffer.m4 rename to tools/topology/topology1/m4/buffer.m4 diff --git a/tools/topology/m4/bytecontrol.m4 b/tools/topology/topology1/m4/bytecontrol.m4 similarity index 100% rename from tools/topology/m4/bytecontrol.m4 rename to tools/topology/topology1/m4/bytecontrol.m4 diff --git a/tools/topology/m4/ch_sel.m4 b/tools/topology/topology1/m4/ch_sel.m4 similarity index 100% rename from tools/topology/m4/ch_sel.m4 rename to tools/topology/topology1/m4/ch_sel.m4 diff --git a/tools/topology/m4/codec_adapter.m4 b/tools/topology/topology1/m4/codec_adapter.m4 similarity index 100% rename from tools/topology/m4/codec_adapter.m4 rename to tools/topology/topology1/m4/codec_adapter.m4 diff --git a/tools/topology/m4/crossover.m4 b/tools/topology/topology1/m4/crossover.m4 similarity index 100% rename from tools/topology/m4/crossover.m4 rename to tools/topology/topology1/m4/crossover.m4 diff --git a/tools/topology/m4/crossover_coef_default.m4 b/tools/topology/topology1/m4/crossover_coef_default.m4 similarity index 100% rename from tools/topology/m4/crossover_coef_default.m4 rename to tools/topology/topology1/m4/crossover_coef_default.m4 diff --git a/tools/topology/m4/dai.m4 b/tools/topology/topology1/m4/dai.m4 similarity index 100% rename from tools/topology/m4/dai.m4 rename to tools/topology/topology1/m4/dai.m4 diff --git a/tools/topology/m4/dcblock.m4 b/tools/topology/topology1/m4/dcblock.m4 similarity index 100% rename from tools/topology/m4/dcblock.m4 rename to tools/topology/topology1/m4/dcblock.m4 diff --git a/tools/topology/m4/dcblock_coef_default.m4 b/tools/topology/topology1/m4/dcblock_coef_default.m4 similarity index 100% rename from tools/topology/m4/dcblock_coef_default.m4 rename to tools/topology/topology1/m4/dcblock_coef_default.m4 diff --git a/tools/topology/m4/debug.m4 b/tools/topology/topology1/m4/debug.m4 similarity index 100% rename from tools/topology/m4/debug.m4 rename to tools/topology/topology1/m4/debug.m4 diff --git a/tools/topology/m4/detect.m4 b/tools/topology/topology1/m4/detect.m4 similarity index 100% rename from tools/topology/m4/detect.m4 rename to tools/topology/topology1/m4/detect.m4 diff --git a/tools/topology/m4/detect_test_coef.m4 b/tools/topology/topology1/m4/detect_test_coef.m4 similarity index 100% rename from tools/topology/m4/detect_test_coef.m4 rename to tools/topology/topology1/m4/detect_test_coef.m4 diff --git a/tools/topology/m4/drc.m4 b/tools/topology/topology1/m4/drc.m4 similarity index 100% rename from tools/topology/m4/drc.m4 rename to tools/topology/topology1/m4/drc.m4 diff --git a/tools/topology/m4/drc_coef_default.m4 b/tools/topology/topology1/m4/drc_coef_default.m4 similarity index 100% rename from tools/topology/m4/drc_coef_default.m4 rename to tools/topology/topology1/m4/drc_coef_default.m4 diff --git a/tools/topology/m4/enumcontrol.m4 b/tools/topology/topology1/m4/enumcontrol.m4 similarity index 100% rename from tools/topology/m4/enumcontrol.m4 rename to tools/topology/topology1/m4/enumcontrol.m4 diff --git a/tools/topology/m4/eq_fir.m4 b/tools/topology/topology1/m4/eq_fir.m4 similarity index 100% rename from tools/topology/m4/eq_fir.m4 rename to tools/topology/topology1/m4/eq_fir.m4 diff --git a/tools/topology/m4/eq_fir_coef_flat.m4 b/tools/topology/topology1/m4/eq_fir_coef_flat.m4 similarity index 100% rename from tools/topology/m4/eq_fir_coef_flat.m4 rename to tools/topology/topology1/m4/eq_fir_coef_flat.m4 diff --git a/tools/topology/m4/eq_fir_coef_loudness.m4 b/tools/topology/topology1/m4/eq_fir_coef_loudness.m4 similarity index 100% rename from tools/topology/m4/eq_fir_coef_loudness.m4 rename to tools/topology/topology1/m4/eq_fir_coef_loudness.m4 diff --git a/tools/topology/m4/eq_fir_coef_mid.m4 b/tools/topology/topology1/m4/eq_fir_coef_mid.m4 similarity index 100% rename from tools/topology/m4/eq_fir_coef_mid.m4 rename to tools/topology/topology1/m4/eq_fir_coef_mid.m4 diff --git a/tools/topology/m4/eq_fir_coef_pass.m4 b/tools/topology/topology1/m4/eq_fir_coef_pass.m4 similarity index 100% rename from tools/topology/m4/eq_fir_coef_pass.m4 rename to tools/topology/topology1/m4/eq_fir_coef_pass.m4 diff --git a/tools/topology/m4/eq_iir.m4 b/tools/topology/topology1/m4/eq_iir.m4 similarity index 100% rename from tools/topology/m4/eq_iir.m4 rename to tools/topology/topology1/m4/eq_iir.m4 diff --git a/tools/topology/m4/eq_iir_bundle.m4 b/tools/topology/topology1/m4/eq_iir_bundle.m4 similarity index 100% rename from tools/topology/m4/eq_iir_bundle.m4 rename to tools/topology/topology1/m4/eq_iir_bundle.m4 diff --git a/tools/topology/m4/eq_iir_coef_bandpass.m4 b/tools/topology/topology1/m4/eq_iir_coef_bandpass.m4 similarity index 100% rename from tools/topology/m4/eq_iir_coef_bandpass.m4 rename to tools/topology/topology1/m4/eq_iir_coef_bandpass.m4 diff --git a/tools/topology/m4/eq_iir_coef_bassboost.m4 b/tools/topology/topology1/m4/eq_iir_coef_bassboost.m4 similarity index 100% rename from tools/topology/m4/eq_iir_coef_bassboost.m4 rename to tools/topology/topology1/m4/eq_iir_coef_bassboost.m4 diff --git a/tools/topology/m4/eq_iir_coef_drceq.m4 b/tools/topology/topology1/m4/eq_iir_coef_drceq.m4 similarity index 100% rename from tools/topology/m4/eq_iir_coef_drceq.m4 rename to tools/topology/topology1/m4/eq_iir_coef_drceq.m4 diff --git a/tools/topology/m4/eq_iir_coef_flat.m4 b/tools/topology/topology1/m4/eq_iir_coef_flat.m4 similarity index 100% rename from tools/topology/m4/eq_iir_coef_flat.m4 rename to tools/topology/topology1/m4/eq_iir_coef_flat.m4 diff --git a/tools/topology/m4/eq_iir_coef_highpass_20hz_0db_16khz.m4 b/tools/topology/topology1/m4/eq_iir_coef_highpass_20hz_0db_16khz.m4 similarity index 100% rename from tools/topology/m4/eq_iir_coef_highpass_20hz_0db_16khz.m4 rename to tools/topology/topology1/m4/eq_iir_coef_highpass_20hz_0db_16khz.m4 diff --git a/tools/topology/m4/eq_iir_coef_highpass_20hz_0db_48khz.m4 b/tools/topology/topology1/m4/eq_iir_coef_highpass_20hz_0db_48khz.m4 similarity index 100% rename from tools/topology/m4/eq_iir_coef_highpass_20hz_0db_48khz.m4 rename to tools/topology/topology1/m4/eq_iir_coef_highpass_20hz_0db_48khz.m4 diff --git a/tools/topology/m4/eq_iir_coef_highpass_20hz_20db_16khz.m4 b/tools/topology/topology1/m4/eq_iir_coef_highpass_20hz_20db_16khz.m4 similarity index 100% rename from tools/topology/m4/eq_iir_coef_highpass_20hz_20db_16khz.m4 rename to tools/topology/topology1/m4/eq_iir_coef_highpass_20hz_20db_16khz.m4 diff --git a/tools/topology/m4/eq_iir_coef_highpass_20hz_20db_48khz.m4 b/tools/topology/topology1/m4/eq_iir_coef_highpass_20hz_20db_48khz.m4 similarity index 100% rename from tools/topology/m4/eq_iir_coef_highpass_20hz_20db_48khz.m4 rename to tools/topology/topology1/m4/eq_iir_coef_highpass_20hz_20db_48khz.m4 diff --git a/tools/topology/m4/eq_iir_coef_highpass_30hz_0db_16khz.m4 b/tools/topology/topology1/m4/eq_iir_coef_highpass_30hz_0db_16khz.m4 similarity index 100% rename from tools/topology/m4/eq_iir_coef_highpass_30hz_0db_16khz.m4 rename to tools/topology/topology1/m4/eq_iir_coef_highpass_30hz_0db_16khz.m4 diff --git a/tools/topology/m4/eq_iir_coef_highpass_30hz_0db_48khz.m4 b/tools/topology/topology1/m4/eq_iir_coef_highpass_30hz_0db_48khz.m4 similarity index 100% rename from tools/topology/m4/eq_iir_coef_highpass_30hz_0db_48khz.m4 rename to tools/topology/topology1/m4/eq_iir_coef_highpass_30hz_0db_48khz.m4 diff --git a/tools/topology/m4/eq_iir_coef_highpass_30hz_20db_16khz.m4 b/tools/topology/topology1/m4/eq_iir_coef_highpass_30hz_20db_16khz.m4 similarity index 100% rename from tools/topology/m4/eq_iir_coef_highpass_30hz_20db_16khz.m4 rename to tools/topology/topology1/m4/eq_iir_coef_highpass_30hz_20db_16khz.m4 diff --git a/tools/topology/m4/eq_iir_coef_highpass_30hz_20db_48khz.m4 b/tools/topology/topology1/m4/eq_iir_coef_highpass_30hz_20db_48khz.m4 similarity index 100% rename from tools/topology/m4/eq_iir_coef_highpass_30hz_20db_48khz.m4 rename to tools/topology/topology1/m4/eq_iir_coef_highpass_30hz_20db_48khz.m4 diff --git a/tools/topology/m4/eq_iir_coef_highpass_40hz_0db_16khz.m4 b/tools/topology/topology1/m4/eq_iir_coef_highpass_40hz_0db_16khz.m4 similarity index 100% rename from tools/topology/m4/eq_iir_coef_highpass_40hz_0db_16khz.m4 rename to tools/topology/topology1/m4/eq_iir_coef_highpass_40hz_0db_16khz.m4 diff --git a/tools/topology/m4/eq_iir_coef_highpass_40hz_0db_48khz.m4 b/tools/topology/topology1/m4/eq_iir_coef_highpass_40hz_0db_48khz.m4 similarity index 100% rename from tools/topology/m4/eq_iir_coef_highpass_40hz_0db_48khz.m4 rename to tools/topology/topology1/m4/eq_iir_coef_highpass_40hz_0db_48khz.m4 diff --git a/tools/topology/m4/eq_iir_coef_highpass_40hz_20db_16khz.m4 b/tools/topology/topology1/m4/eq_iir_coef_highpass_40hz_20db_16khz.m4 similarity index 100% rename from tools/topology/m4/eq_iir_coef_highpass_40hz_20db_16khz.m4 rename to tools/topology/topology1/m4/eq_iir_coef_highpass_40hz_20db_16khz.m4 diff --git a/tools/topology/m4/eq_iir_coef_highpass_40hz_20db_48khz.m4 b/tools/topology/topology1/m4/eq_iir_coef_highpass_40hz_20db_48khz.m4 similarity index 100% rename from tools/topology/m4/eq_iir_coef_highpass_40hz_20db_48khz.m4 rename to tools/topology/topology1/m4/eq_iir_coef_highpass_40hz_20db_48khz.m4 diff --git a/tools/topology/m4/eq_iir_coef_highpass_50hz_0db_16khz.m4 b/tools/topology/topology1/m4/eq_iir_coef_highpass_50hz_0db_16khz.m4 similarity index 100% rename from tools/topology/m4/eq_iir_coef_highpass_50hz_0db_16khz.m4 rename to tools/topology/topology1/m4/eq_iir_coef_highpass_50hz_0db_16khz.m4 diff --git a/tools/topology/m4/eq_iir_coef_highpass_50hz_0db_48khz.m4 b/tools/topology/topology1/m4/eq_iir_coef_highpass_50hz_0db_48khz.m4 similarity index 100% rename from tools/topology/m4/eq_iir_coef_highpass_50hz_0db_48khz.m4 rename to tools/topology/topology1/m4/eq_iir_coef_highpass_50hz_0db_48khz.m4 diff --git a/tools/topology/m4/eq_iir_coef_highpass_50hz_20db_16khz.m4 b/tools/topology/topology1/m4/eq_iir_coef_highpass_50hz_20db_16khz.m4 similarity index 100% rename from tools/topology/m4/eq_iir_coef_highpass_50hz_20db_16khz.m4 rename to tools/topology/topology1/m4/eq_iir_coef_highpass_50hz_20db_16khz.m4 diff --git a/tools/topology/m4/eq_iir_coef_highpass_50hz_20db_48khz.m4 b/tools/topology/topology1/m4/eq_iir_coef_highpass_50hz_20db_48khz.m4 similarity index 100% rename from tools/topology/m4/eq_iir_coef_highpass_50hz_20db_48khz.m4 rename to tools/topology/topology1/m4/eq_iir_coef_highpass_50hz_20db_48khz.m4 diff --git a/tools/topology/m4/eq_iir_coef_loudness.m4 b/tools/topology/topology1/m4/eq_iir_coef_loudness.m4 similarity index 100% rename from tools/topology/m4/eq_iir_coef_loudness.m4 rename to tools/topology/topology1/m4/eq_iir_coef_loudness.m4 diff --git a/tools/topology/m4/eq_iir_coef_pass.m4 b/tools/topology/topology1/m4/eq_iir_coef_pass.m4 similarity index 100% rename from tools/topology/m4/eq_iir_coef_pass.m4 rename to tools/topology/topology1/m4/eq_iir_coef_pass.m4 diff --git a/tools/topology/m4/google_hotword_detect.m4 b/tools/topology/topology1/m4/google_hotword_detect.m4 similarity index 100% rename from tools/topology/m4/google_hotword_detect.m4 rename to tools/topology/topology1/m4/google_hotword_detect.m4 diff --git a/tools/topology/m4/igo_nr.m4 b/tools/topology/topology1/m4/igo_nr.m4 similarity index 100% rename from tools/topology/m4/igo_nr.m4 rename to tools/topology/topology1/m4/igo_nr.m4 diff --git a/tools/topology/m4/kpbm.m4 b/tools/topology/topology1/m4/kpbm.m4 similarity index 100% rename from tools/topology/m4/kpbm.m4 rename to tools/topology/topology1/m4/kpbm.m4 diff --git a/tools/topology/m4/mixer.m4 b/tools/topology/topology1/m4/mixer.m4 similarity index 100% rename from tools/topology/m4/mixer.m4 rename to tools/topology/topology1/m4/mixer.m4 diff --git a/tools/topology/m4/mixercontrol.m4 b/tools/topology/topology1/m4/mixercontrol.m4 similarity index 100% rename from tools/topology/m4/mixercontrol.m4 rename to tools/topology/topology1/m4/mixercontrol.m4 diff --git a/tools/topology/m4/multiband_drc.m4 b/tools/topology/topology1/m4/multiband_drc.m4 similarity index 100% rename from tools/topology/m4/multiband_drc.m4 rename to tools/topology/topology1/m4/multiband_drc.m4 diff --git a/tools/topology/m4/multiband_drc_coef_default.m4 b/tools/topology/topology1/m4/multiband_drc_coef_default.m4 similarity index 100% rename from tools/topology/m4/multiband_drc_coef_default.m4 rename to tools/topology/topology1/m4/multiband_drc_coef_default.m4 diff --git a/tools/topology/m4/muxdemux.m4 b/tools/topology/topology1/m4/muxdemux.m4 similarity index 100% rename from tools/topology/m4/muxdemux.m4 rename to tools/topology/topology1/m4/muxdemux.m4 diff --git a/tools/topology/m4/pcm.m4 b/tools/topology/topology1/m4/pcm.m4 similarity index 100% rename from tools/topology/m4/pcm.m4 rename to tools/topology/topology1/m4/pcm.m4 diff --git a/tools/topology/m4/pga.m4 b/tools/topology/topology1/m4/pga.m4 similarity index 100% rename from tools/topology/m4/pga.m4 rename to tools/topology/topology1/m4/pga.m4 diff --git a/tools/topology/m4/pipeline.m4 b/tools/topology/topology1/m4/pipeline.m4 similarity index 100% rename from tools/topology/m4/pipeline.m4 rename to tools/topology/topology1/m4/pipeline.m4 diff --git a/tools/topology/m4/smart_amp.m4 b/tools/topology/topology1/m4/smart_amp.m4 similarity index 100% rename from tools/topology/m4/smart_amp.m4 rename to tools/topology/topology1/m4/smart_amp.m4 diff --git a/tools/topology/m4/src.m4 b/tools/topology/topology1/m4/src.m4 similarity index 100% rename from tools/topology/m4/src.m4 rename to tools/topology/topology1/m4/src.m4 diff --git a/tools/topology/m4/tdfb.m4 b/tools/topology/topology1/m4/tdfb.m4 similarity index 100% rename from tools/topology/m4/tdfb.m4 rename to tools/topology/topology1/m4/tdfb.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_50mm_az0el0deg_16khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_50mm_az0el0deg_16khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_50mm_az0el0deg_16khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_50mm_az0el0deg_16khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_50mm_az0el0deg_48khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_50mm_az0el0deg_48khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_50mm_az0el0deg_48khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_50mm_az0el0deg_48khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_50mm_az10el0deg_16khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_50mm_az10el0deg_16khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_50mm_az10el0deg_16khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_50mm_az10el0deg_16khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_50mm_az10el0deg_48khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_50mm_az10el0deg_48khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_50mm_az10el0deg_48khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_50mm_az10el0deg_48khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_50mm_az25el0deg_16khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_50mm_az25el0deg_16khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_50mm_az25el0deg_16khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_50mm_az25el0deg_16khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_50mm_az25el0deg_48khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_50mm_az25el0deg_48khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_50mm_az25el0deg_48khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_50mm_az25el0deg_48khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_50mm_az90el0deg_16khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_50mm_az90el0deg_16khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_50mm_az90el0deg_16khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_50mm_az90el0deg_16khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_50mm_az90el0deg_48khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_50mm_az90el0deg_48khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_50mm_az90el0deg_48khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_50mm_az90el0deg_48khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_50mm_azm10el0deg_16khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_50mm_azm10el0deg_16khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_50mm_azm10el0deg_16khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_50mm_azm10el0deg_16khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_50mm_azm10el0deg_48khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_50mm_azm10el0deg_48khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_50mm_azm10el0deg_48khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_50mm_azm10el0deg_48khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_50mm_azm25el0deg_16khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_50mm_azm25el0deg_16khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_50mm_azm25el0deg_16khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_50mm_azm25el0deg_16khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_50mm_azm25el0deg_48khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_50mm_azm25el0deg_48khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_50mm_azm25el0deg_48khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_50mm_azm25el0deg_48khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_50mm_azm90el0deg_16khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_50mm_azm90el0deg_16khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_50mm_azm90el0deg_16khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_50mm_azm90el0deg_16khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_50mm_azm90el0deg_48khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_50mm_azm90el0deg_48khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_50mm_azm90el0deg_48khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_50mm_azm90el0deg_48khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_50mm_pm10deg_16khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_50mm_pm10deg_16khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_50mm_pm10deg_16khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_50mm_pm10deg_16khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_50mm_pm10deg_48khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_50mm_pm10deg_48khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_50mm_pm10deg_48khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_50mm_pm10deg_48khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_50mm_pm25deg_16khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_50mm_pm25deg_16khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_50mm_pm25deg_16khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_50mm_pm25deg_16khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_50mm_pm25deg_48khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_50mm_pm25deg_48khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_50mm_pm25deg_48khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_50mm_pm25deg_48khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_50mm_pm90deg_16khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_50mm_pm90deg_16khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_50mm_pm90deg_16khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_50mm_pm90deg_16khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_50mm_pm90deg_48khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_50mm_pm90deg_48khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_50mm_pm90deg_48khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_50mm_pm90deg_48khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_67mm_az0el0deg_16khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_67mm_az0el0deg_16khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_67mm_az0el0deg_16khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_67mm_az0el0deg_16khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_67mm_az0el0deg_48khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_67mm_az0el0deg_48khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_67mm_az0el0deg_48khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_67mm_az0el0deg_48khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_67mm_az10el0deg_16khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_67mm_az10el0deg_16khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_67mm_az10el0deg_16khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_67mm_az10el0deg_16khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_67mm_az10el0deg_48khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_67mm_az10el0deg_48khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_67mm_az10el0deg_48khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_67mm_az10el0deg_48khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_67mm_az25el0deg_16khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_67mm_az25el0deg_16khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_67mm_az25el0deg_16khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_67mm_az25el0deg_16khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_67mm_az25el0deg_48khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_67mm_az25el0deg_48khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_67mm_az25el0deg_48khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_67mm_az25el0deg_48khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_67mm_az90el0deg_16khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_67mm_az90el0deg_16khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_67mm_az90el0deg_16khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_67mm_az90el0deg_16khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_67mm_az90el0deg_48khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_67mm_az90el0deg_48khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_67mm_az90el0deg_48khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_67mm_az90el0deg_48khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_67mm_azm10el0deg_16khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_67mm_azm10el0deg_16khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_67mm_azm10el0deg_16khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_67mm_azm10el0deg_16khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_67mm_azm10el0deg_48khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_67mm_azm10el0deg_48khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_67mm_azm10el0deg_48khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_67mm_azm10el0deg_48khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_67mm_azm25el0deg_16khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_67mm_azm25el0deg_16khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_67mm_azm25el0deg_16khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_67mm_azm25el0deg_16khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_67mm_azm25el0deg_48khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_67mm_azm25el0deg_48khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_67mm_azm25el0deg_48khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_67mm_azm25el0deg_48khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_67mm_azm90el0deg_16khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_67mm_azm90el0deg_16khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_67mm_azm90el0deg_16khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_67mm_azm90el0deg_16khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_67mm_azm90el0deg_48khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_67mm_azm90el0deg_48khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_67mm_azm90el0deg_48khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_67mm_azm90el0deg_48khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line2_pass.m4 b/tools/topology/topology1/m4/tdfb/coef_line2_pass.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line2_pass.m4 rename to tools/topology/topology1/m4/tdfb/coef_line2_pass.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_28mm_az0el0deg_16khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_28mm_az0el0deg_16khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_28mm_az0el0deg_16khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_28mm_az0el0deg_16khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_28mm_az0el0deg_48khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_28mm_az0el0deg_48khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_28mm_az0el0deg_48khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_28mm_az0el0deg_48khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_28mm_az10el0deg_16khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_28mm_az10el0deg_16khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_28mm_az10el0deg_16khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_28mm_az10el0deg_16khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_28mm_az10el0deg_48khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_28mm_az10el0deg_48khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_28mm_az10el0deg_48khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_28mm_az10el0deg_48khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_28mm_az25el0deg_16khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_28mm_az25el0deg_16khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_28mm_az25el0deg_16khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_28mm_az25el0deg_16khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_28mm_az25el0deg_48khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_28mm_az25el0deg_48khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_28mm_az25el0deg_48khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_28mm_az25el0deg_48khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_28mm_az90el0deg_16khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_28mm_az90el0deg_16khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_28mm_az90el0deg_16khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_28mm_az90el0deg_16khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_28mm_az90el0deg_48khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_28mm_az90el0deg_48khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_28mm_az90el0deg_48khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_28mm_az90el0deg_48khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_28mm_azm10el0deg_16khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_28mm_azm10el0deg_16khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_28mm_azm10el0deg_16khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_28mm_azm10el0deg_16khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_28mm_azm10el0deg_48khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_28mm_azm10el0deg_48khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_28mm_azm10el0deg_48khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_28mm_azm10el0deg_48khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_28mm_azm25el0deg_16khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_28mm_azm25el0deg_16khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_28mm_azm25el0deg_16khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_28mm_azm25el0deg_16khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_28mm_azm25el0deg_48khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_28mm_azm25el0deg_48khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_28mm_azm25el0deg_48khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_28mm_azm25el0deg_48khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_28mm_azm90el0deg_16khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_28mm_azm90el0deg_16khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_28mm_azm90el0deg_16khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_28mm_azm90el0deg_16khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_28mm_azm90el0deg_48khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_28mm_azm90el0deg_48khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_28mm_azm90el0deg_48khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_28mm_azm90el0deg_48khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_28mm_pm10deg_16khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_28mm_pm10deg_16khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_28mm_pm10deg_16khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_28mm_pm10deg_16khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_28mm_pm10deg_48khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_28mm_pm10deg_48khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_28mm_pm10deg_48khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_28mm_pm10deg_48khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_28mm_pm25deg_16khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_28mm_pm25deg_16khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_28mm_pm25deg_16khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_28mm_pm25deg_16khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_28mm_pm25deg_48khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_28mm_pm25deg_48khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_28mm_pm25deg_48khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_28mm_pm25deg_48khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_28mm_pm90deg_16khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_28mm_pm90deg_16khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_28mm_pm90deg_16khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_28mm_pm90deg_16khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_28mm_pm90deg_48khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_28mm_pm90deg_48khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_28mm_pm90deg_48khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_28mm_pm90deg_48khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_78mm_az0el0deg_16khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_78mm_az0el0deg_16khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_78mm_az0el0deg_16khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_78mm_az0el0deg_16khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_78mm_az0el0deg_48khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_78mm_az0el0deg_48khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_78mm_az0el0deg_48khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_78mm_az0el0deg_48khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_78mm_az10el0deg_16khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_78mm_az10el0deg_16khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_78mm_az10el0deg_16khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_78mm_az10el0deg_16khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_78mm_az10el0deg_48khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_78mm_az10el0deg_48khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_78mm_az10el0deg_48khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_78mm_az10el0deg_48khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_78mm_az25el0deg_16khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_78mm_az25el0deg_16khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_78mm_az25el0deg_16khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_78mm_az25el0deg_16khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_78mm_az25el0deg_48khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_78mm_az25el0deg_48khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_78mm_az25el0deg_48khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_78mm_az25el0deg_48khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_78mm_az90el0deg_16khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_78mm_az90el0deg_16khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_78mm_az90el0deg_16khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_78mm_az90el0deg_16khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_78mm_az90el0deg_48khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_78mm_az90el0deg_48khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_78mm_az90el0deg_48khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_78mm_az90el0deg_48khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_78mm_azm10el0deg_16khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_78mm_azm10el0deg_16khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_78mm_azm10el0deg_16khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_78mm_azm10el0deg_16khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_78mm_azm10el0deg_48khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_78mm_azm10el0deg_48khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_78mm_azm10el0deg_48khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_78mm_azm10el0deg_48khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_78mm_azm25el0deg_16khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_78mm_azm25el0deg_16khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_78mm_azm25el0deg_16khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_78mm_azm25el0deg_16khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_78mm_azm25el0deg_48khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_78mm_azm25el0deg_48khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_78mm_azm25el0deg_48khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_78mm_azm25el0deg_48khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_78mm_azm90el0deg_16khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_78mm_azm90el0deg_16khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_78mm_azm90el0deg_16khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_78mm_azm90el0deg_16khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_78mm_azm90el0deg_48khz.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_78mm_azm90el0deg_48khz.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_78mm_azm90el0deg_48khz.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_78mm_azm90el0deg_48khz.m4 diff --git a/tools/topology/m4/tdfb/coef_line4_pass.m4 b/tools/topology/topology1/m4/tdfb/coef_line4_pass.m4 similarity index 100% rename from tools/topology/m4/tdfb/coef_line4_pass.m4 rename to tools/topology/topology1/m4/tdfb/coef_line4_pass.m4 diff --git a/tools/topology/m4/tone.m4 b/tools/topology/topology1/m4/tone.m4 similarity index 100% rename from tools/topology/m4/tone.m4 rename to tools/topology/topology1/m4/tone.m4 diff --git a/tools/topology/m4/utils.m4 b/tools/topology/topology1/m4/utils.m4 similarity index 100% rename from tools/topology/m4/utils.m4 rename to tools/topology/topology1/m4/utils.m4 diff --git a/tools/topology/platform/common/alh.m4 b/tools/topology/topology1/platform/common/alh.m4 similarity index 100% rename from tools/topology/platform/common/alh.m4 rename to tools/topology/topology1/platform/common/alh.m4 diff --git a/tools/topology/platform/common/esai.m4 b/tools/topology/topology1/platform/common/esai.m4 similarity index 100% rename from tools/topology/platform/common/esai.m4 rename to tools/topology/topology1/platform/common/esai.m4 diff --git a/tools/topology/platform/common/hda.m4 b/tools/topology/topology1/platform/common/hda.m4 similarity index 100% rename from tools/topology/platform/common/hda.m4 rename to tools/topology/topology1/platform/common/hda.m4 diff --git a/tools/topology/platform/common/sai.m4 b/tools/topology/topology1/platform/common/sai.m4 similarity index 100% rename from tools/topology/platform/common/sai.m4 rename to tools/topology/topology1/platform/common/sai.m4 diff --git a/tools/topology/platform/common/ssp.m4 b/tools/topology/topology1/platform/common/ssp.m4 similarity index 100% rename from tools/topology/platform/common/ssp.m4 rename to tools/topology/topology1/platform/common/ssp.m4 diff --git a/tools/topology/platform/imx/imx8.m4 b/tools/topology/topology1/platform/imx/imx8.m4 similarity index 100% rename from tools/topology/platform/imx/imx8.m4 rename to tools/topology/topology1/platform/imx/imx8.m4 diff --git a/tools/topology/platform/intel/adl.m4 b/tools/topology/topology1/platform/intel/adl.m4 similarity index 100% rename from tools/topology/platform/intel/adl.m4 rename to tools/topology/topology1/platform/intel/adl.m4 diff --git a/tools/topology/platform/intel/apl-dmic-a2b2.m4 b/tools/topology/topology1/platform/intel/apl-dmic-a2b2.m4 similarity index 100% rename from tools/topology/platform/intel/apl-dmic-a2b2.m4 rename to tools/topology/topology1/platform/intel/apl-dmic-a2b2.m4 diff --git a/tools/topology/platform/intel/apl-dmic-a2b4.m4 b/tools/topology/topology1/platform/intel/apl-dmic-a2b4.m4 similarity index 100% rename from tools/topology/platform/intel/apl-dmic-a2b4.m4 rename to tools/topology/topology1/platform/intel/apl-dmic-a2b4.m4 diff --git a/tools/topology/platform/intel/apl-dmic-a4b2.m4 b/tools/topology/topology1/platform/intel/apl-dmic-a4b2.m4 similarity index 100% rename from tools/topology/platform/intel/apl-dmic-a4b2.m4 rename to tools/topology/topology1/platform/intel/apl-dmic-a4b2.m4 diff --git a/tools/topology/platform/intel/bdw.m4 b/tools/topology/topology1/platform/intel/bdw.m4 similarity index 100% rename from tools/topology/platform/intel/bdw.m4 rename to tools/topology/topology1/platform/intel/bdw.m4 diff --git a/tools/topology/platform/intel/bxt.m4 b/tools/topology/topology1/platform/intel/bxt.m4 similarity index 100% rename from tools/topology/platform/intel/bxt.m4 rename to tools/topology/topology1/platform/intel/bxt.m4 diff --git a/tools/topology/platform/intel/byt-codec.m4 b/tools/topology/topology1/platform/intel/byt-codec.m4 similarity index 100% rename from tools/topology/platform/intel/byt-codec.m4 rename to tools/topology/topology1/platform/intel/byt-codec.m4 diff --git a/tools/topology/platform/intel/byt-nocodec.m4 b/tools/topology/topology1/platform/intel/byt-nocodec.m4 similarity index 100% rename from tools/topology/platform/intel/byt-nocodec.m4 rename to tools/topology/topology1/platform/intel/byt-nocodec.m4 diff --git a/tools/topology/platform/intel/byt.m4 b/tools/topology/topology1/platform/intel/byt.m4 similarity index 100% rename from tools/topology/platform/intel/byt.m4 rename to tools/topology/topology1/platform/intel/byt.m4 diff --git a/tools/topology/platform/intel/cht-codec.m4 b/tools/topology/topology1/platform/intel/cht-codec.m4 similarity index 100% rename from tools/topology/platform/intel/cht-codec.m4 rename to tools/topology/topology1/platform/intel/cht-codec.m4 diff --git a/tools/topology/platform/intel/cht-nocodec.m4 b/tools/topology/topology1/platform/intel/cht-nocodec.m4 similarity index 100% rename from tools/topology/platform/intel/cht-nocodec.m4 rename to tools/topology/topology1/platform/intel/cht-nocodec.m4 diff --git a/tools/topology/platform/intel/cht.m4 b/tools/topology/topology1/platform/intel/cht.m4 similarity index 100% rename from tools/topology/platform/intel/cht.m4 rename to tools/topology/topology1/platform/intel/cht.m4 diff --git a/tools/topology/platform/intel/cml-da7219.m4 b/tools/topology/topology1/platform/intel/cml-da7219.m4 similarity index 100% rename from tools/topology/platform/intel/cml-da7219.m4 rename to tools/topology/topology1/platform/intel/cml-da7219.m4 diff --git a/tools/topology/platform/intel/cml.m4 b/tools/topology/topology1/platform/intel/cml.m4 similarity index 100% rename from tools/topology/platform/intel/cml.m4 rename to tools/topology/topology1/platform/intel/cml.m4 diff --git a/tools/topology/platform/intel/cnl.m4 b/tools/topology/topology1/platform/intel/cnl.m4 similarity index 100% rename from tools/topology/platform/intel/cnl.m4 rename to tools/topology/topology1/platform/intel/cnl.m4 diff --git a/tools/topology/platform/intel/dmic.m4 b/tools/topology/topology1/platform/intel/dmic.m4 similarity index 100% rename from tools/topology/platform/intel/dmic.m4 rename to tools/topology/topology1/platform/intel/dmic.m4 diff --git a/tools/topology/platform/intel/ehl.m4 b/tools/topology/topology1/platform/intel/ehl.m4 similarity index 100% rename from tools/topology/platform/intel/ehl.m4 rename to tools/topology/topology1/platform/intel/ehl.m4 diff --git a/tools/topology/platform/intel/glk-da7219.m4 b/tools/topology/topology1/platform/intel/glk-da7219.m4 similarity index 100% rename from tools/topology/platform/intel/glk-da7219.m4 rename to tools/topology/topology1/platform/intel/glk-da7219.m4 diff --git a/tools/topology/platform/intel/hsw.m4 b/tools/topology/topology1/platform/intel/hsw.m4 similarity index 100% rename from tools/topology/platform/intel/hsw.m4 rename to tools/topology/topology1/platform/intel/hsw.m4 diff --git a/tools/topology/platform/intel/icl.m4 b/tools/topology/topology1/platform/intel/icl.m4 similarity index 100% rename from tools/topology/platform/intel/icl.m4 rename to tools/topology/topology1/platform/intel/icl.m4 diff --git a/tools/topology/platform/intel/intel-generic-bt.m4 b/tools/topology/topology1/platform/intel/intel-generic-bt.m4 similarity index 100% rename from tools/topology/platform/intel/intel-generic-bt.m4 rename to tools/topology/topology1/platform/intel/intel-generic-bt.m4 diff --git a/tools/topology/platform/intel/intel-generic-dmic-kwd.m4 b/tools/topology/topology1/platform/intel/intel-generic-dmic-kwd.m4 similarity index 100% rename from tools/topology/platform/intel/intel-generic-dmic-kwd.m4 rename to tools/topology/topology1/platform/intel/intel-generic-dmic-kwd.m4 diff --git a/tools/topology/platform/intel/intel-generic-dmic.m4 b/tools/topology/topology1/platform/intel/intel-generic-dmic.m4 similarity index 100% rename from tools/topology/platform/intel/intel-generic-dmic.m4 rename to tools/topology/topology1/platform/intel/intel-generic-dmic.m4 diff --git a/tools/topology/platform/intel/jsl-dedede.m4 b/tools/topology/topology1/platform/intel/jsl-dedede.m4 similarity index 100% rename from tools/topology/platform/intel/jsl-dedede.m4 rename to tools/topology/topology1/platform/intel/jsl-dedede.m4 diff --git a/tools/topology/platform/intel/jsl-rt1015.m4 b/tools/topology/topology1/platform/intel/jsl-rt1015.m4 similarity index 100% rename from tools/topology/platform/intel/jsl-rt1015.m4 rename to tools/topology/topology1/platform/intel/jsl-rt1015.m4 diff --git a/tools/topology/platform/intel/jsl.m4 b/tools/topology/topology1/platform/intel/jsl.m4 similarity index 100% rename from tools/topology/platform/intel/jsl.m4 rename to tools/topology/topology1/platform/intel/jsl.m4 diff --git a/tools/topology/platform/intel/tgl.m4 b/tools/topology/topology1/platform/intel/tgl.m4 similarity index 100% rename from tools/topology/platform/intel/tgl.m4 rename to tools/topology/topology1/platform/intel/tgl.m4 diff --git a/tools/topology/platform/intel/whl.m4 b/tools/topology/topology1/platform/intel/whl.m4 similarity index 100% rename from tools/topology/platform/intel/whl.m4 rename to tools/topology/topology1/platform/intel/whl.m4 diff --git a/tools/topology/sof-apl-da7219.m4 b/tools/topology/topology1/sof-apl-da7219.m4 similarity index 100% rename from tools/topology/sof-apl-da7219.m4 rename to tools/topology/topology1/sof-apl-da7219.m4 diff --git a/tools/topology/sof-apl-demux-pcm512x.m4 b/tools/topology/topology1/sof-apl-demux-pcm512x.m4 similarity index 100% rename from tools/topology/sof-apl-demux-pcm512x.m4 rename to tools/topology/topology1/sof-apl-demux-pcm512x.m4 diff --git a/tools/topology/sof-apl-keyword-detect.m4 b/tools/topology/topology1/sof-apl-keyword-detect.m4 similarity index 100% rename from tools/topology/sof-apl-keyword-detect.m4 rename to tools/topology/topology1/sof-apl-keyword-detect.m4 diff --git a/tools/topology/sof-apl-nocodec.m4 b/tools/topology/topology1/sof-apl-nocodec.m4 similarity index 100% rename from tools/topology/sof-apl-nocodec.m4 rename to tools/topology/topology1/sof-apl-nocodec.m4 diff --git a/tools/topology/sof-apl-pcm512x.m4 b/tools/topology/topology1/sof-apl-pcm512x.m4 similarity index 100% rename from tools/topology/sof-apl-pcm512x.m4 rename to tools/topology/topology1/sof-apl-pcm512x.m4 diff --git a/tools/topology/sof-apl-rt298.m4 b/tools/topology/topology1/sof-apl-rt298.m4 similarity index 100% rename from tools/topology/sof-apl-rt298.m4 rename to tools/topology/topology1/sof-apl-rt298.m4 diff --git a/tools/topology/sof-apl-tdf8532.m4 b/tools/topology/topology1/sof-apl-tdf8532.m4 similarity index 100% rename from tools/topology/sof-apl-tdf8532.m4 rename to tools/topology/topology1/sof-apl-tdf8532.m4 diff --git a/tools/topology/sof-apl-wm8804.m4 b/tools/topology/topology1/sof-apl-wm8804.m4 similarity index 100% rename from tools/topology/sof-apl-wm8804.m4 rename to tools/topology/topology1/sof-apl-wm8804.m4 diff --git a/tools/topology/sof-bdw-codec.m4 b/tools/topology/topology1/sof-bdw-codec.m4 similarity index 100% rename from tools/topology/sof-bdw-codec.m4 rename to tools/topology/topology1/sof-bdw-codec.m4 diff --git a/tools/topology/sof-bdw-nocodec.m4 b/tools/topology/topology1/sof-bdw-nocodec.m4 similarity index 100% rename from tools/topology/sof-bdw-nocodec.m4 rename to tools/topology/topology1/sof-bdw-nocodec.m4 diff --git a/tools/topology/sof-byt-codec.m4 b/tools/topology/topology1/sof-byt-codec.m4 similarity index 100% rename from tools/topology/sof-byt-codec.m4 rename to tools/topology/topology1/sof-byt-codec.m4 diff --git a/tools/topology/sof-cht-max98090.m4 b/tools/topology/topology1/sof-cht-max98090.m4 similarity index 100% rename from tools/topology/sof-cht-max98090.m4 rename to tools/topology/topology1/sof-cht-max98090.m4 diff --git a/tools/topology/sof-cht-nocodec.m4 b/tools/topology/topology1/sof-cht-nocodec.m4 similarity index 100% rename from tools/topology/sof-cht-nocodec.m4 rename to tools/topology/topology1/sof-cht-nocodec.m4 diff --git a/tools/topology/sof-cml-demux-rt5682-max98357a.m4 b/tools/topology/topology1/sof-cml-demux-rt5682-max98357a.m4 similarity index 100% rename from tools/topology/sof-cml-demux-rt5682-max98357a.m4 rename to tools/topology/topology1/sof-cml-demux-rt5682-max98357a.m4 diff --git a/tools/topology/sof-cml-demux-rt5682.m4 b/tools/topology/topology1/sof-cml-demux-rt5682.m4 similarity index 100% rename from tools/topology/sof-cml-demux-rt5682.m4 rename to tools/topology/topology1/sof-cml-demux-rt5682.m4 diff --git a/tools/topology/sof-cml-rt1011-rt5682.m4 b/tools/topology/topology1/sof-cml-rt1011-rt5682.m4 similarity index 100% rename from tools/topology/sof-cml-rt1011-rt5682.m4 rename to tools/topology/topology1/sof-cml-rt1011-rt5682.m4 diff --git a/tools/topology/sof-cml-rt5682-kwd.m4 b/tools/topology/topology1/sof-cml-rt5682-kwd.m4 similarity index 100% rename from tools/topology/sof-cml-rt5682-kwd.m4 rename to tools/topology/topology1/sof-cml-rt5682-kwd.m4 diff --git a/tools/topology/sof-cml-rt5682-max98357a.m4 b/tools/topology/topology1/sof-cml-rt5682-max98357a.m4 similarity index 100% rename from tools/topology/sof-cml-rt5682-max98357a.m4 rename to tools/topology/topology1/sof-cml-rt5682-max98357a.m4 diff --git a/tools/topology/sof-cml-rt5682.m4 b/tools/topology/topology1/sof-cml-rt5682.m4 similarity index 100% rename from tools/topology/sof-cml-rt5682.m4 rename to tools/topology/topology1/sof-cml-rt5682.m4 diff --git a/tools/topology/sof-cml-rt700.m4 b/tools/topology/topology1/sof-cml-rt700.m4 similarity index 100% rename from tools/topology/sof-cml-rt700.m4 rename to tools/topology/topology1/sof-cml-rt700.m4 diff --git a/tools/topology/sof-cnl-nocodec.m4 b/tools/topology/topology1/sof-cnl-nocodec.m4 similarity index 100% rename from tools/topology/sof-cnl-nocodec.m4 rename to tools/topology/topology1/sof-cnl-nocodec.m4 diff --git a/tools/topology/sof-cnl-rt274.m4 b/tools/topology/topology1/sof-cnl-rt274.m4 similarity index 100% rename from tools/topology/sof-cnl-rt274.m4 rename to tools/topology/topology1/sof-cnl-rt274.m4 diff --git a/tools/topology/sof-cnl-rt5682-sdw2.m4 b/tools/topology/topology1/sof-cnl-rt5682-sdw2.m4 similarity index 100% rename from tools/topology/sof-cnl-rt5682-sdw2.m4 rename to tools/topology/topology1/sof-cnl-rt5682-sdw2.m4 diff --git a/tools/topology/sof-ehl-rt5660.m4 b/tools/topology/topology1/sof-ehl-rt5660.m4 similarity index 100% rename from tools/topology/sof-ehl-rt5660.m4 rename to tools/topology/topology1/sof-ehl-rt5660.m4 diff --git a/tools/topology/sof-glk-da7219-kwd.m4 b/tools/topology/topology1/sof-glk-da7219-kwd.m4 similarity index 100% rename from tools/topology/sof-glk-da7219-kwd.m4 rename to tools/topology/topology1/sof-glk-da7219-kwd.m4 diff --git a/tools/topology/sof-glk-da7219.m4 b/tools/topology/topology1/sof-glk-da7219.m4 similarity index 100% rename from tools/topology/sof-glk-da7219.m4 rename to tools/topology/topology1/sof-glk-da7219.m4 diff --git a/tools/topology/sof-glk-rt5682.m4 b/tools/topology/topology1/sof-glk-rt5682.m4 similarity index 100% rename from tools/topology/sof-glk-rt5682.m4 rename to tools/topology/topology1/sof-glk-rt5682.m4 diff --git a/tools/topology/sof-hda-generic-idisp.m4 b/tools/topology/topology1/sof-hda-generic-idisp.m4 similarity index 100% rename from tools/topology/sof-hda-generic-idisp.m4 rename to tools/topology/topology1/sof-hda-generic-idisp.m4 diff --git a/tools/topology/sof-hda-generic-kwd.m4 b/tools/topology/topology1/sof-hda-generic-kwd.m4 similarity index 100% rename from tools/topology/sof-hda-generic-kwd.m4 rename to tools/topology/topology1/sof-hda-generic-kwd.m4 diff --git a/tools/topology/sof-hda-generic.m4 b/tools/topology/topology1/sof-hda-generic.m4 similarity index 100% rename from tools/topology/sof-hda-generic.m4 rename to tools/topology/topology1/sof-hda-generic.m4 diff --git a/tools/topology/sof-icl-dmic-4ch.m4 b/tools/topology/topology1/sof-icl-dmic-4ch.m4 similarity index 100% rename from tools/topology/sof-icl-dmic-4ch.m4 rename to tools/topology/topology1/sof-icl-dmic-4ch.m4 diff --git a/tools/topology/sof-icl-nocodec.m4 b/tools/topology/topology1/sof-icl-nocodec.m4 similarity index 100% rename from tools/topology/sof-icl-nocodec.m4 rename to tools/topology/topology1/sof-icl-nocodec.m4 diff --git a/tools/topology/sof-icl-rt700.m4 b/tools/topology/topology1/sof-icl-rt700.m4 similarity index 100% rename from tools/topology/sof-icl-rt700.m4 rename to tools/topology/topology1/sof-icl-rt700.m4 diff --git a/tools/topology/sof-icl-rt711-rt1308-rt715-hdmi.m4 b/tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 similarity index 100% rename from tools/topology/sof-icl-rt711-rt1308-rt715-hdmi.m4 rename to tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4 diff --git a/tools/topology/sof-imx8-cs42888-mixer.m4 b/tools/topology/topology1/sof-imx8-cs42888-mixer.m4 similarity index 100% rename from tools/topology/sof-imx8-cs42888-mixer.m4 rename to tools/topology/topology1/sof-imx8-cs42888-mixer.m4 diff --git a/tools/topology/sof-imx8-cs42888.m4 b/tools/topology/topology1/sof-imx8-cs42888.m4 similarity index 100% rename from tools/topology/sof-imx8-cs42888.m4 rename to tools/topology/topology1/sof-imx8-cs42888.m4 diff --git a/tools/topology/sof-imx8-nocodec-sai.m4 b/tools/topology/topology1/sof-imx8-nocodec-sai.m4 similarity index 100% rename from tools/topology/sof-imx8-nocodec-sai.m4 rename to tools/topology/topology1/sof-imx8-nocodec-sai.m4 diff --git a/tools/topology/sof-imx8-nocodec.m4 b/tools/topology/topology1/sof-imx8-nocodec.m4 similarity index 100% rename from tools/topology/sof-imx8-nocodec.m4 rename to tools/topology/topology1/sof-imx8-nocodec.m4 diff --git a/tools/topology/sof-imx8-wm8960-kwd.m4 b/tools/topology/topology1/sof-imx8-wm8960-kwd.m4 similarity index 100% rename from tools/topology/sof-imx8-wm8960-kwd.m4 rename to tools/topology/topology1/sof-imx8-wm8960-kwd.m4 diff --git a/tools/topology/sof-imx8-wm8960-mixer.m4 b/tools/topology/topology1/sof-imx8-wm8960-mixer.m4 similarity index 100% rename from tools/topology/sof-imx8-wm8960-mixer.m4 rename to tools/topology/topology1/sof-imx8-wm8960-mixer.m4 diff --git a/tools/topology/sof-imx8-wm8960.m4 b/tools/topology/topology1/sof-imx8-wm8960.m4 similarity index 100% rename from tools/topology/sof-imx8-wm8960.m4 rename to tools/topology/topology1/sof-imx8-wm8960.m4 diff --git a/tools/topology/sof-imx8mp-wm8960-kwd.m4 b/tools/topology/topology1/sof-imx8mp-wm8960-kwd.m4 similarity index 100% rename from tools/topology/sof-imx8mp-wm8960-kwd.m4 rename to tools/topology/topology1/sof-imx8mp-wm8960-kwd.m4 diff --git a/tools/topology/sof-imx8mp-wm8960-mixer.m4 b/tools/topology/topology1/sof-imx8mp-wm8960-mixer.m4 similarity index 100% rename from tools/topology/sof-imx8mp-wm8960-mixer.m4 rename to tools/topology/topology1/sof-imx8mp-wm8960-mixer.m4 diff --git a/tools/topology/sof-imx8mp-wm8960.m4 b/tools/topology/topology1/sof-imx8mp-wm8960.m4 similarity index 100% rename from tools/topology/sof-imx8mp-wm8960.m4 rename to tools/topology/topology1/sof-imx8mp-wm8960.m4 diff --git a/tools/topology/sof-jsl-da7219.m4 b/tools/topology/topology1/sof-jsl-da7219.m4 similarity index 100% rename from tools/topology/sof-jsl-da7219.m4 rename to tools/topology/topology1/sof-jsl-da7219.m4 diff --git a/tools/topology/sof-jsl-rt5682.m4 b/tools/topology/topology1/sof-jsl-rt5682.m4 similarity index 100% rename from tools/topology/sof-jsl-rt5682.m4 rename to tools/topology/topology1/sof-jsl-rt5682.m4 diff --git a/tools/topology/sof-smart-amplifier-nocodec.m4 b/tools/topology/topology1/sof-smart-amplifier-nocodec.m4 similarity index 100% rename from tools/topology/sof-smart-amplifier-nocodec.m4 rename to tools/topology/topology1/sof-smart-amplifier-nocodec.m4 diff --git a/tools/topology/sof-smart-amplifier.m4 b/tools/topology/topology1/sof-smart-amplifier.m4 similarity index 100% rename from tools/topology/sof-smart-amplifier.m4 rename to tools/topology/topology1/sof-smart-amplifier.m4 diff --git a/tools/topology/sof-tgl-max98357a-rt5682.m4 b/tools/topology/topology1/sof-tgl-max98357a-rt5682.m4 similarity index 100% rename from tools/topology/sof-tgl-max98357a-rt5682.m4 rename to tools/topology/topology1/sof-tgl-max98357a-rt5682.m4 diff --git a/tools/topology/sof-tgl-max98373-rt5682.m4 b/tools/topology/topology1/sof-tgl-max98373-rt5682.m4 similarity index 100% rename from tools/topology/sof-tgl-max98373-rt5682.m4 rename to tools/topology/topology1/sof-tgl-max98373-rt5682.m4 diff --git a/tools/topology/sof-tgl-nocodec.m4 b/tools/topology/topology1/sof-tgl-nocodec.m4 similarity index 100% rename from tools/topology/sof-tgl-nocodec.m4 rename to tools/topology/topology1/sof-tgl-nocodec.m4 diff --git a/tools/topology/sof-tgl-rt711-rt1308.m4 b/tools/topology/topology1/sof-tgl-rt711-rt1308.m4 similarity index 100% rename from tools/topology/sof-tgl-rt711-rt1308.m4 rename to tools/topology/topology1/sof-tgl-rt711-rt1308.m4 diff --git a/tools/topology/sof-tgl-sdw-max98373-rt5682.m4 b/tools/topology/topology1/sof-tgl-sdw-max98373-rt5682.m4 similarity index 100% rename from tools/topology/sof-tgl-sdw-max98373-rt5682.m4 rename to tools/topology/topology1/sof-tgl-sdw-max98373-rt5682.m4 diff --git a/tools/topology/sof/pipe-amp-ref-capture.m4 b/tools/topology/topology1/sof/pipe-amp-ref-capture.m4 similarity index 100% rename from tools/topology/sof/pipe-amp-ref-capture.m4 rename to tools/topology/topology1/sof/pipe-amp-ref-capture.m4 diff --git a/tools/topology/sof/pipe-asrc-capture.m4 b/tools/topology/topology1/sof/pipe-asrc-capture.m4 similarity index 100% rename from tools/topology/sof/pipe-asrc-capture.m4 rename to tools/topology/topology1/sof/pipe-asrc-capture.m4 diff --git a/tools/topology/sof/pipe-asrc-playback.m4 b/tools/topology/topology1/sof/pipe-asrc-playback.m4 similarity index 100% rename from tools/topology/sof/pipe-asrc-playback.m4 rename to tools/topology/topology1/sof/pipe-asrc-playback.m4 diff --git a/tools/topology/sof/pipe-asrc-volume-capture.m4 b/tools/topology/topology1/sof/pipe-asrc-volume-capture.m4 similarity index 100% rename from tools/topology/sof/pipe-asrc-volume-capture.m4 rename to tools/topology/topology1/sof/pipe-asrc-volume-capture.m4 diff --git a/tools/topology/sof/pipe-asrc-volume-playback.m4 b/tools/topology/topology1/sof/pipe-asrc-volume-playback.m4 similarity index 100% rename from tools/topology/sof/pipe-asrc-volume-playback.m4 rename to tools/topology/topology1/sof/pipe-asrc-volume-playback.m4 diff --git a/tools/topology/sof/pipe-codec-adapter-capture.m4 b/tools/topology/topology1/sof/pipe-codec-adapter-capture.m4 similarity index 100% rename from tools/topology/sof/pipe-codec-adapter-capture.m4 rename to tools/topology/topology1/sof/pipe-codec-adapter-capture.m4 diff --git a/tools/topology/sof/pipe-codec-adapter-playback.m4 b/tools/topology/topology1/sof/pipe-codec-adapter-playback.m4 similarity index 100% rename from tools/topology/sof/pipe-codec-adapter-playback.m4 rename to tools/topology/topology1/sof/pipe-codec-adapter-playback.m4 diff --git a/tools/topology/sof/pipe-crossover-playback.m4 b/tools/topology/topology1/sof/pipe-crossover-playback.m4 similarity index 100% rename from tools/topology/sof/pipe-crossover-playback.m4 rename to tools/topology/topology1/sof/pipe-crossover-playback.m4 diff --git a/tools/topology/sof/pipe-dai-capture.m4 b/tools/topology/topology1/sof/pipe-dai-capture.m4 similarity index 100% rename from tools/topology/sof/pipe-dai-capture.m4 rename to tools/topology/topology1/sof/pipe-dai-capture.m4 diff --git a/tools/topology/sof/pipe-dai-endpoint.m4 b/tools/topology/topology1/sof/pipe-dai-endpoint.m4 similarity index 100% rename from tools/topology/sof/pipe-dai-endpoint.m4 rename to tools/topology/topology1/sof/pipe-dai-endpoint.m4 diff --git a/tools/topology/sof/pipe-dai-playback.m4 b/tools/topology/topology1/sof/pipe-dai-playback.m4 similarity index 100% rename from tools/topology/sof/pipe-dai-playback.m4 rename to tools/topology/topology1/sof/pipe-dai-playback.m4 diff --git a/tools/topology/sof/pipe-dai-sched-playback.m4 b/tools/topology/topology1/sof/pipe-dai-sched-playback.m4 similarity index 100% rename from tools/topology/sof/pipe-dai-sched-playback.m4 rename to tools/topology/topology1/sof/pipe-dai-sched-playback.m4 diff --git a/tools/topology/sof/pipe-dcblock-capture.m4 b/tools/topology/topology1/sof/pipe-dcblock-capture.m4 similarity index 100% rename from tools/topology/sof/pipe-dcblock-capture.m4 rename to tools/topology/topology1/sof/pipe-dcblock-capture.m4 diff --git a/tools/topology/sof/pipe-dcblock-playback.m4 b/tools/topology/topology1/sof/pipe-dcblock-playback.m4 similarity index 100% rename from tools/topology/sof/pipe-dcblock-playback.m4 rename to tools/topology/topology1/sof/pipe-dcblock-playback.m4 diff --git a/tools/topology/sof/pipe-dcblock-volume-playback.m4 b/tools/topology/topology1/sof/pipe-dcblock-volume-playback.m4 similarity index 100% rename from tools/topology/sof/pipe-dcblock-volume-playback.m4 rename to tools/topology/topology1/sof/pipe-dcblock-volume-playback.m4 diff --git a/tools/topology/sof/pipe-detect.m4 b/tools/topology/topology1/sof/pipe-detect.m4 similarity index 100% rename from tools/topology/sof/pipe-detect.m4 rename to tools/topology/topology1/sof/pipe-detect.m4 diff --git a/tools/topology/sof/pipe-drc-capture.m4 b/tools/topology/topology1/sof/pipe-drc-capture.m4 similarity index 100% rename from tools/topology/sof/pipe-drc-capture.m4 rename to tools/topology/topology1/sof/pipe-drc-capture.m4 diff --git a/tools/topology/sof/pipe-drc-eq-volume-demux-playback.m4 b/tools/topology/topology1/sof/pipe-drc-eq-volume-demux-playback.m4 similarity index 100% rename from tools/topology/sof/pipe-drc-eq-volume-demux-playback.m4 rename to tools/topology/topology1/sof/pipe-drc-eq-volume-demux-playback.m4 diff --git a/tools/topology/sof/pipe-drc-playback.m4 b/tools/topology/topology1/sof/pipe-drc-playback.m4 similarity index 100% rename from tools/topology/sof/pipe-drc-playback.m4 rename to tools/topology/topology1/sof/pipe-drc-playback.m4 diff --git a/tools/topology/sof/pipe-eq-fir-capture.m4 b/tools/topology/topology1/sof/pipe-eq-fir-capture.m4 similarity index 100% rename from tools/topology/sof/pipe-eq-fir-capture.m4 rename to tools/topology/topology1/sof/pipe-eq-fir-capture.m4 diff --git a/tools/topology/sof/pipe-eq-fir-playback.m4 b/tools/topology/topology1/sof/pipe-eq-fir-playback.m4 similarity index 100% rename from tools/topology/sof/pipe-eq-fir-playback.m4 rename to tools/topology/topology1/sof/pipe-eq-fir-playback.m4 diff --git a/tools/topology/sof/pipe-eq-fir-volume-capture.m4 b/tools/topology/topology1/sof/pipe-eq-fir-volume-capture.m4 similarity index 100% rename from tools/topology/sof/pipe-eq-fir-volume-capture.m4 rename to tools/topology/topology1/sof/pipe-eq-fir-volume-capture.m4 diff --git a/tools/topology/sof/pipe-eq-fir-volume-playback.m4 b/tools/topology/topology1/sof/pipe-eq-fir-volume-playback.m4 similarity index 100% rename from tools/topology/sof/pipe-eq-fir-volume-playback.m4 rename to tools/topology/topology1/sof/pipe-eq-fir-volume-playback.m4 diff --git a/tools/topology/sof/pipe-eq-iir-capture.m4 b/tools/topology/topology1/sof/pipe-eq-iir-capture.m4 similarity index 100% rename from tools/topology/sof/pipe-eq-iir-capture.m4 rename to tools/topology/topology1/sof/pipe-eq-iir-capture.m4 diff --git a/tools/topology/sof/pipe-eq-iir-eq-fir-volume-playback.m4 b/tools/topology/topology1/sof/pipe-eq-iir-eq-fir-volume-playback.m4 similarity index 100% rename from tools/topology/sof/pipe-eq-iir-eq-fir-volume-playback.m4 rename to tools/topology/topology1/sof/pipe-eq-iir-eq-fir-volume-playback.m4 diff --git a/tools/topology/sof/pipe-eq-iir-playback.m4 b/tools/topology/topology1/sof/pipe-eq-iir-playback.m4 similarity index 100% rename from tools/topology/sof/pipe-eq-iir-playback.m4 rename to tools/topology/topology1/sof/pipe-eq-iir-playback.m4 diff --git a/tools/topology/sof/pipe-eq-iir-volume-capture-16khz.m4 b/tools/topology/topology1/sof/pipe-eq-iir-volume-capture-16khz.m4 similarity index 100% rename from tools/topology/sof/pipe-eq-iir-volume-capture-16khz.m4 rename to tools/topology/topology1/sof/pipe-eq-iir-volume-capture-16khz.m4 diff --git a/tools/topology/sof/pipe-eq-iir-volume-capture.m4 b/tools/topology/topology1/sof/pipe-eq-iir-volume-capture.m4 similarity index 100% rename from tools/topology/sof/pipe-eq-iir-volume-capture.m4 rename to tools/topology/topology1/sof/pipe-eq-iir-volume-capture.m4 diff --git a/tools/topology/sof/pipe-eq-iir-volume-playback.m4 b/tools/topology/topology1/sof/pipe-eq-iir-volume-playback.m4 similarity index 100% rename from tools/topology/sof/pipe-eq-iir-volume-playback.m4 rename to tools/topology/topology1/sof/pipe-eq-iir-volume-playback.m4 diff --git a/tools/topology/sof/pipe-google-hotword-detect.m4 b/tools/topology/topology1/sof/pipe-google-hotword-detect.m4 similarity index 100% rename from tools/topology/sof/pipe-google-hotword-detect.m4 rename to tools/topology/topology1/sof/pipe-google-hotword-detect.m4 diff --git a/tools/topology/sof/pipe-highpass-capture.m4 b/tools/topology/topology1/sof/pipe-highpass-capture.m4 similarity index 100% rename from tools/topology/sof/pipe-highpass-capture.m4 rename to tools/topology/topology1/sof/pipe-highpass-capture.m4 diff --git a/tools/topology/sof/pipe-highpass-switch-capture.m4 b/tools/topology/topology1/sof/pipe-highpass-switch-capture.m4 similarity index 100% rename from tools/topology/sof/pipe-highpass-switch-capture.m4 rename to tools/topology/topology1/sof/pipe-highpass-switch-capture.m4 diff --git a/tools/topology/sof/pipe-host-volume-playback.m4 b/tools/topology/topology1/sof/pipe-host-volume-playback.m4 similarity index 100% rename from tools/topology/sof/pipe-host-volume-playback.m4 rename to tools/topology/topology1/sof/pipe-host-volume-playback.m4 diff --git a/tools/topology/sof/pipe-igonr-capture.m4 b/tools/topology/topology1/sof/pipe-igonr-capture.m4 similarity index 100% rename from tools/topology/sof/pipe-igonr-capture.m4 rename to tools/topology/topology1/sof/pipe-igonr-capture.m4 diff --git a/tools/topology/sof/pipe-kfbm-capture.m4 b/tools/topology/topology1/sof/pipe-kfbm-capture.m4 similarity index 100% rename from tools/topology/sof/pipe-kfbm-capture.m4 rename to tools/topology/topology1/sof/pipe-kfbm-capture.m4 diff --git a/tools/topology/sof/pipe-kfbm-no-lp-capture.m4 b/tools/topology/topology1/sof/pipe-kfbm-no-lp-capture.m4 similarity index 100% rename from tools/topology/sof/pipe-kfbm-no-lp-capture.m4 rename to tools/topology/topology1/sof/pipe-kfbm-no-lp-capture.m4 diff --git a/tools/topology/sof/pipe-low-latency-capture.m4 b/tools/topology/topology1/sof/pipe-low-latency-capture.m4 similarity index 100% rename from tools/topology/sof/pipe-low-latency-capture.m4 rename to tools/topology/topology1/sof/pipe-low-latency-capture.m4 diff --git a/tools/topology/sof/pipe-low-latency-playback.m4 b/tools/topology/topology1/sof/pipe-low-latency-playback.m4 similarity index 100% rename from tools/topology/sof/pipe-low-latency-playback.m4 rename to tools/topology/topology1/sof/pipe-low-latency-playback.m4 diff --git a/tools/topology/sof/pipe-mixer-dai-playback.m4 b/tools/topology/topology1/sof/pipe-mixer-dai-playback.m4 similarity index 100% rename from tools/topology/sof/pipe-mixer-dai-playback.m4 rename to tools/topology/topology1/sof/pipe-mixer-dai-playback.m4 diff --git a/tools/topology/sof/pipe-multiband-drc-capture.m4 b/tools/topology/topology1/sof/pipe-multiband-drc-capture.m4 similarity index 100% rename from tools/topology/sof/pipe-multiband-drc-capture.m4 rename to tools/topology/topology1/sof/pipe-multiband-drc-capture.m4 diff --git a/tools/topology/sof/pipe-multiband-drc-playback.m4 b/tools/topology/topology1/sof/pipe-multiband-drc-playback.m4 similarity index 100% rename from tools/topology/sof/pipe-multiband-drc-playback.m4 rename to tools/topology/topology1/sof/pipe-multiband-drc-playback.m4 diff --git a/tools/topology/sof/pipe-passthrough-capture-sched.m4 b/tools/topology/topology1/sof/pipe-passthrough-capture-sched.m4 similarity index 100% rename from tools/topology/sof/pipe-passthrough-capture-sched.m4 rename to tools/topology/topology1/sof/pipe-passthrough-capture-sched.m4 diff --git a/tools/topology/sof/pipe-passthrough-capture.m4 b/tools/topology/topology1/sof/pipe-passthrough-capture.m4 similarity index 100% rename from tools/topology/sof/pipe-passthrough-capture.m4 rename to tools/topology/topology1/sof/pipe-passthrough-capture.m4 diff --git a/tools/topology/sof/pipe-passthrough-playback.m4 b/tools/topology/topology1/sof/pipe-passthrough-playback.m4 similarity index 100% rename from tools/topology/sof/pipe-passthrough-playback.m4 rename to tools/topology/topology1/sof/pipe-passthrough-playback.m4 diff --git a/tools/topology/sof/pipe-pcm-media.m4 b/tools/topology/topology1/sof/pipe-pcm-media.m4 similarity index 100% rename from tools/topology/sof/pipe-pcm-media.m4 rename to tools/topology/topology1/sof/pipe-pcm-media.m4 diff --git a/tools/topology/sof/pipe-processing-playback.m4 b/tools/topology/topology1/sof/pipe-processing-playback.m4 similarity index 100% rename from tools/topology/sof/pipe-processing-playback.m4 rename to tools/topology/topology1/sof/pipe-processing-playback.m4 diff --git a/tools/topology/sof/pipe-smart-amplifier-playback.m4 b/tools/topology/topology1/sof/pipe-smart-amplifier-playback.m4 similarity index 100% rename from tools/topology/sof/pipe-smart-amplifier-playback.m4 rename to tools/topology/topology1/sof/pipe-smart-amplifier-playback.m4 diff --git a/tools/topology/sof/pipe-src-capture.m4 b/tools/topology/topology1/sof/pipe-src-capture.m4 similarity index 100% rename from tools/topology/sof/pipe-src-capture.m4 rename to tools/topology/topology1/sof/pipe-src-capture.m4 diff --git a/tools/topology/sof/pipe-src-playback.m4 b/tools/topology/topology1/sof/pipe-src-playback.m4 similarity index 100% rename from tools/topology/sof/pipe-src-playback.m4 rename to tools/topology/topology1/sof/pipe-src-playback.m4 diff --git a/tools/topology/sof/pipe-src-volume-capture.m4 b/tools/topology/topology1/sof/pipe-src-volume-capture.m4 similarity index 100% rename from tools/topology/sof/pipe-src-volume-capture.m4 rename to tools/topology/topology1/sof/pipe-src-volume-capture.m4 diff --git a/tools/topology/sof/pipe-src-volume-playback.m4 b/tools/topology/topology1/sof/pipe-src-volume-playback.m4 similarity index 100% rename from tools/topology/sof/pipe-src-volume-playback.m4 rename to tools/topology/topology1/sof/pipe-src-volume-playback.m4 diff --git a/tools/topology/sof/pipe-tdfb-capture-16khz.m4 b/tools/topology/topology1/sof/pipe-tdfb-capture-16khz.m4 similarity index 100% rename from tools/topology/sof/pipe-tdfb-capture-16khz.m4 rename to tools/topology/topology1/sof/pipe-tdfb-capture-16khz.m4 diff --git a/tools/topology/sof/pipe-tdfb-capture.m4 b/tools/topology/topology1/sof/pipe-tdfb-capture.m4 similarity index 100% rename from tools/topology/sof/pipe-tdfb-capture.m4 rename to tools/topology/topology1/sof/pipe-tdfb-capture.m4 diff --git a/tools/topology/sof/pipe-tdfb-eq-iir-volume-capture-16khz.m4 b/tools/topology/topology1/sof/pipe-tdfb-eq-iir-volume-capture-16khz.m4 similarity index 100% rename from tools/topology/sof/pipe-tdfb-eq-iir-volume-capture-16khz.m4 rename to tools/topology/topology1/sof/pipe-tdfb-eq-iir-volume-capture-16khz.m4 diff --git a/tools/topology/sof/pipe-tdfb-eq-iir-volume-capture.m4 b/tools/topology/topology1/sof/pipe-tdfb-eq-iir-volume-capture.m4 similarity index 100% rename from tools/topology/sof/pipe-tdfb-eq-iir-volume-capture.m4 rename to tools/topology/topology1/sof/pipe-tdfb-eq-iir-volume-capture.m4 diff --git a/tools/topology/sof/pipe-tdfb-playback.m4 b/tools/topology/topology1/sof/pipe-tdfb-playback.m4 similarity index 100% rename from tools/topology/sof/pipe-tdfb-playback.m4 rename to tools/topology/topology1/sof/pipe-tdfb-playback.m4 diff --git a/tools/topology/sof/pipe-tdfb-volume-capture-16khz.m4 b/tools/topology/topology1/sof/pipe-tdfb-volume-capture-16khz.m4 similarity index 100% rename from tools/topology/sof/pipe-tdfb-volume-capture-16khz.m4 rename to tools/topology/topology1/sof/pipe-tdfb-volume-capture-16khz.m4 diff --git a/tools/topology/sof/pipe-tdfb-volume-capture.m4 b/tools/topology/topology1/sof/pipe-tdfb-volume-capture.m4 similarity index 100% rename from tools/topology/sof/pipe-tdfb-volume-capture.m4 rename to tools/topology/topology1/sof/pipe-tdfb-volume-capture.m4 diff --git a/tools/topology/sof/pipe-tone.m4 b/tools/topology/topology1/sof/pipe-tone.m4 similarity index 100% rename from tools/topology/sof/pipe-tone.m4 rename to tools/topology/topology1/sof/pipe-tone.m4 diff --git a/tools/topology/sof/pipe-vol-kfbm-capture.m4 b/tools/topology/topology1/sof/pipe-vol-kfbm-capture.m4 similarity index 100% rename from tools/topology/sof/pipe-vol-kfbm-capture.m4 rename to tools/topology/topology1/sof/pipe-vol-kfbm-capture.m4 diff --git a/tools/topology/sof/pipe-volume-capture-16khz.m4 b/tools/topology/topology1/sof/pipe-volume-capture-16khz.m4 similarity index 100% rename from tools/topology/sof/pipe-volume-capture-16khz.m4 rename to tools/topology/topology1/sof/pipe-volume-capture-16khz.m4 diff --git a/tools/topology/sof/pipe-volume-capture-sched.m4 b/tools/topology/topology1/sof/pipe-volume-capture-sched.m4 similarity index 100% rename from tools/topology/sof/pipe-volume-capture-sched.m4 rename to tools/topology/topology1/sof/pipe-volume-capture-sched.m4 diff --git a/tools/topology/sof/pipe-volume-capture.m4 b/tools/topology/topology1/sof/pipe-volume-capture.m4 similarity index 100% rename from tools/topology/sof/pipe-volume-capture.m4 rename to tools/topology/topology1/sof/pipe-volume-capture.m4 diff --git a/tools/topology/sof/pipe-volume-demux-playback.m4 b/tools/topology/topology1/sof/pipe-volume-demux-playback.m4 similarity index 100% rename from tools/topology/sof/pipe-volume-demux-playback.m4 rename to tools/topology/topology1/sof/pipe-volume-demux-playback.m4 diff --git a/tools/topology/sof/pipe-volume-playback.m4 b/tools/topology/topology1/sof/pipe-volume-playback.m4 similarity index 100% rename from tools/topology/sof/pipe-volume-playback.m4 rename to tools/topology/topology1/sof/pipe-volume-playback.m4 diff --git a/tools/topology/sof/pipe-volume-switch-capture.m4 b/tools/topology/topology1/sof/pipe-volume-switch-capture.m4 similarity index 100% rename from tools/topology/sof/pipe-volume-switch-capture.m4 rename to tools/topology/topology1/sof/pipe-volume-switch-capture.m4 diff --git a/tools/topology/sof/pipe-waves-codec-demux-playback.m4 b/tools/topology/topology1/sof/pipe-waves-codec-demux-playback.m4 similarity index 100% rename from tools/topology/sof/pipe-waves-codec-demux-playback.m4 rename to tools/topology/topology1/sof/pipe-waves-codec-demux-playback.m4 diff --git a/tools/topology/sof/pipe-waves-codec-playback.m4 b/tools/topology/topology1/sof/pipe-waves-codec-playback.m4 similarity index 100% rename from tools/topology/sof/pipe-waves-codec-playback.m4 rename to tools/topology/topology1/sof/pipe-waves-codec-playback.m4 diff --git a/tools/topology/sof/tokens.m4 b/tools/topology/topology1/sof/tokens.m4 similarity index 100% rename from tools/topology/sof/tokens.m4 rename to tools/topology/topology1/sof/tokens.m4 diff --git a/tools/topology2/include/common/route.conf b/tools/topology/topology2/include/common/route.conf similarity index 100% rename from tools/topology2/include/common/route.conf rename to tools/topology/topology2/include/common/route.conf diff --git a/tools/topology2/include/common/tokens.conf b/tools/topology/topology2/include/common/tokens.conf similarity index 100% rename from tools/topology2/include/common/tokens.conf rename to tools/topology/topology2/include/common/tokens.conf diff --git a/tools/topology2/include/common/vendor-token.conf b/tools/topology/topology2/include/common/vendor-token.conf similarity index 100% rename from tools/topology2/include/common/vendor-token.conf rename to tools/topology/topology2/include/common/vendor-token.conf diff --git a/tools/topology2/include/components/asrc.conf b/tools/topology/topology2/include/components/asrc.conf similarity index 100% rename from tools/topology2/include/components/asrc.conf rename to tools/topology/topology2/include/components/asrc.conf diff --git a/tools/topology2/include/components/buffer.conf b/tools/topology/topology2/include/components/buffer.conf similarity index 100% rename from tools/topology2/include/components/buffer.conf rename to tools/topology/topology2/include/components/buffer.conf diff --git a/tools/topology2/include/components/dai.conf b/tools/topology/topology2/include/components/dai.conf similarity index 100% rename from tools/topology2/include/components/dai.conf rename to tools/topology/topology2/include/components/dai.conf diff --git a/tools/topology2/include/components/host.conf b/tools/topology/topology2/include/components/host.conf similarity index 100% rename from tools/topology2/include/components/host.conf rename to tools/topology/topology2/include/components/host.conf diff --git a/tools/topology2/include/components/pipeline.conf b/tools/topology/topology2/include/components/pipeline.conf similarity index 100% rename from tools/topology2/include/components/pipeline.conf rename to tools/topology/topology2/include/components/pipeline.conf diff --git a/tools/topology2/include/components/src.conf b/tools/topology/topology2/include/components/src.conf similarity index 100% rename from tools/topology2/include/components/src.conf rename to tools/topology/topology2/include/components/src.conf diff --git a/tools/topology2/include/components/volume.conf b/tools/topology/topology2/include/components/volume.conf similarity index 100% rename from tools/topology2/include/components/volume.conf rename to tools/topology/topology2/include/components/volume.conf diff --git a/tools/topology2/include/components/widget-common.conf b/tools/topology/topology2/include/components/widget-common.conf similarity index 100% rename from tools/topology2/include/components/widget-common.conf rename to tools/topology/topology2/include/components/widget-common.conf diff --git a/tools/topology2/include/controls/common.conf b/tools/topology/topology2/include/controls/common.conf similarity index 100% rename from tools/topology2/include/controls/common.conf rename to tools/topology/topology2/include/controls/common.conf diff --git a/tools/topology2/include/controls/mixer.conf b/tools/topology/topology2/include/controls/mixer.conf similarity index 100% rename from tools/topology2/include/controls/mixer.conf rename to tools/topology/topology2/include/controls/mixer.conf