From b1d4c90307a4de80e629a6307aab0a503e706dbc Mon Sep 17 00:00:00 2001 From: Daniel Baluta Date: Mon, 21 Oct 2024 10:53:09 +0300 Subject: [PATCH] tools: topology1: Move IMX topologies to production All IMX topologies are used in our internal tests and are "production" ready. So move them to production/ directory. Also, we added '-X' parameter to ./scripts/build-tools.sh which compiles all topology1 files under /production. So now IMX build script can just use ./scripts/build-tools.sh -X and have all necessary topologies compiled! Signed-off-by: Daniel Baluta --- tools/topology/topology1/CMakeLists.txt | 13 +++++++++++++ .../topology1/development/CMakeLists.txt | 18 ------------------ .../sof-imx8-compr-pcm-cap-wm8960.m4 | 0 .../sof-imx8-compr-pcm-wm8960.m4 | 0 .../{development => }/sof-imx8-compr-wm8960.m4 | 0 .../{development => }/sof-imx8-src-cs42888.m4 | 0 .../{development => }/sof-imx8-src-wm8960.m4 | 0 .../sof-imx8mp-compr-pcm-cap-wm8960.m4 | 0 .../sof-imx8mp-compr-pcm-wm8960.m4 | 0 .../sof-imx8mp-compr-wm8960.m4 | 0 10 files changed, 13 insertions(+), 18 deletions(-) rename tools/topology/topology1/{development => }/sof-imx8-compr-pcm-cap-wm8960.m4 (100%) rename tools/topology/topology1/{development => }/sof-imx8-compr-pcm-wm8960.m4 (100%) rename tools/topology/topology1/{development => }/sof-imx8-compr-wm8960.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-compr-pcm-cap-wm8960.m4 (100%) rename tools/topology/topology1/{development => }/sof-imx8mp-compr-pcm-wm8960.m4 (100%) rename tools/topology/topology1/{development => }/sof-imx8mp-compr-wm8960.m4 (100%) diff --git a/tools/topology/topology1/CMakeLists.txt b/tools/topology/topology1/CMakeLists.txt index b7bf189c284c..5c9d9926d0c4 100644 --- a/tools/topology/topology1/CMakeLists.txt +++ b/tools/topology/topology1/CMakeLists.txt @@ -38,6 +38,13 @@ set(TPLGS "sof-imx8-wm8960\;sof-imx8-eq-fir-wm8960\;-DCODEC=wm8960\;-DRATE=48000\;-DPPROC=eq-fir-volume\;-DSAI_INDEX=1" "sof-imx8-wm8960\;sof-imx8-eq-fir-wm8962\;-DCODEC=wm8962\;-DRATE=48000\;-DPPROC=eq-fir-volume\;-DSAI_INDEX=1" "sof-imx8-wm8960\;sof-imx8-drc-wm8960\;-DCODEC=wm8960\;-DRATE=48000\;-DPPROC=drc\;-DSAI_INDEX=1" + "sof-imx8-src-wm8960\;sof-imx8-src-wm8960\;-DCODEC=wm8960\;-DRATE=48000\;-DPPROC=src\;-DSAI_INDEX=1" + "sof-imx8-src-wm8960\;sof-imx8-src-wm8962\;-DCODEC=wm8962\;-DRATE=48000\;-DPPROC=src\;-DSAI_INDEX=1" + "sof-imx8-src-cs42888\;sof-imx8-src-cs42888" + "sof-imx8-compr-pcm-wm8960\;sof-imx8-compr-pcm-wm8960" + "sof-imx8-compr-pcm-cap-wm8960\;sof-imx8-compr-pcm-cap-wm8960" + "sof-imx8-compr-wm8960\;sof-imx8-compr-wm8960\;-DCODEC=wm8960\;-DRATE=48000" + "sof-imx8-compr-wm8960\;sof-imx8-compr-wm8962\;-DCODEC=wm8962\;-DRATE=48000" ## end i.MX8 (i.MX8QM and i.MX8QXP) topologies ## i.MX8MP topologies @@ -57,6 +64,12 @@ set(TPLGS "sof-imx8-wm8960\;sof-imx8mp-eq-fir-wm8962\;-DCODEC=wm8962\;-DRATE=48000\;-DPPROC=eq-fir-volume\;-DSAI_INDEX=3\;-DDMA_DOMAIN" "sof-imx8-wm8960\;sof-imx8mp-gui-components-wm8960\;-DCODEC=wm8960\;-DRATE=48000\;-DPPROC=gui-components\;-DSAI_INDEX=3\;-DDMA_DOMAIN" "sof-imx8-wm8960\;sof-imx8mp-drc-wm8960\;-DCODEC=wm8960\;-DRATE=48000\;-DPPROC=drc\;-DSAI_INDEX=3\;-DDMA_DOMAIN" + "sof-imx8-src-wm8960\;sof-imx8mp-src-wm8960\;-DCODEC=wm8960\;-DRATE=48000\;-DPPROC=src\;-DSAI_INDEX=3\;-DDMA_DOMAIN" + "sof-imx8-src-wm8960\;sof-imx8mp-src-wm8962\;-DCODEC=wm8962\;-DRATE=48000\;-DPPROC=src\;-DSAI_INDEX=3\;-DDMA_DOMAIN" + "sof-imx8mp-compr-pcm-wm8960\;sof-imx8mp-compr-pcm-wm8960" + "sof-imx8mp-compr-pcm-cap-wm8960\;sof-imx8mp-compr-pcm-cap-wm8960" + "sof-imx8mp-compr-wm8960\;sof-imx8mp-compr-wm8960\;-DCODEC=wm8960\;-DRATE=48000" + "sof-imx8mp-compr-wm8960\;sof-imx8mp-compr-wm8962\;-DCODEC=wm8962\;-DRATE=48000" ## end i.MX8MP topologies ## i.MX8ULP topologies diff --git a/tools/topology/topology1/development/CMakeLists.txt b/tools/topology/topology1/development/CMakeLists.txt index 3b2ec5a0ed0d..b3bbb5c72317 100644 --- a/tools/topology/topology1/development/CMakeLists.txt +++ b/tools/topology/topology1/development/CMakeLists.txt @@ -1,24 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause set(TPLGS - ## i.MX8 (i.MX8QM and i.MX8QXP) topologies - "sof-imx8-src-wm8960\;sof-imx8-src-wm8960\;-DCODEC=wm8960\;-DRATE=48000\;-DPPROC=src\;-DSAI_INDEX=1" - "sof-imx8-src-wm8960\;sof-imx8-src-wm8962\;-DCODEC=wm8962\;-DRATE=48000\;-DPPROC=src\;-DSAI_INDEX=1" - "sof-imx8-src-cs42888\;sof-imx8-src-cs42888" - "sof-imx8-compr-pcm-wm8960\;sof-imx8-compr-pcm-wm8960" - "sof-imx8-compr-pcm-cap-wm8960\;sof-imx8-compr-pcm-cap-wm8960" - "sof-imx8-compr-wm8960\;sof-imx8-compr-wm8960\;-DCODEC=wm8960\;-DRATE=48000" - "sof-imx8-compr-wm8960\;sof-imx8-compr-wm8962\;-DCODEC=wm8962\;-DRATE=48000" - ## end i.MX8 (i.MX8QM and i.MX8QXP) topologies - - ## i.MX8MP topologies - "sof-imx8-src-wm8960\;sof-imx8mp-src-wm8960\;-DCODEC=wm8960\;-DRATE=48000\;-DPPROC=src\;-DSAI_INDEX=3\;-DDMA_DOMAIN" - "sof-imx8-src-wm8960\;sof-imx8mp-src-wm8962\;-DCODEC=wm8962\;-DRATE=48000\;-DPPROC=src\;-DSAI_INDEX=3\;-DDMA_DOMAIN" - "sof-imx8mp-compr-pcm-wm8960\;sof-imx8mp-compr-pcm-wm8960" - "sof-imx8mp-compr-pcm-cap-wm8960\;sof-imx8mp-compr-pcm-cap-wm8960" - "sof-imx8mp-compr-wm8960\;sof-imx8mp-compr-wm8960\;-DCODEC=wm8960\;-DRATE=48000" - "sof-imx8mp-compr-wm8960\;sof-imx8mp-compr-wm8962\;-DCODEC=wm8962\;-DRATE=48000" - ## end i.MX8MP topologies ) diff --git a/tools/topology/topology1/development/sof-imx8-compr-pcm-cap-wm8960.m4 b/tools/topology/topology1/sof-imx8-compr-pcm-cap-wm8960.m4 similarity index 100% rename from tools/topology/topology1/development/sof-imx8-compr-pcm-cap-wm8960.m4 rename to tools/topology/topology1/sof-imx8-compr-pcm-cap-wm8960.m4 diff --git a/tools/topology/topology1/development/sof-imx8-compr-pcm-wm8960.m4 b/tools/topology/topology1/sof-imx8-compr-pcm-wm8960.m4 similarity index 100% rename from tools/topology/topology1/development/sof-imx8-compr-pcm-wm8960.m4 rename to tools/topology/topology1/sof-imx8-compr-pcm-wm8960.m4 diff --git a/tools/topology/topology1/development/sof-imx8-compr-wm8960.m4 b/tools/topology/topology1/sof-imx8-compr-wm8960.m4 similarity index 100% rename from tools/topology/topology1/development/sof-imx8-compr-wm8960.m4 rename to tools/topology/topology1/sof-imx8-compr-wm8960.m4 diff --git a/tools/topology/topology1/development/sof-imx8-src-cs42888.m4 b/tools/topology/topology1/sof-imx8-src-cs42888.m4 similarity index 100% rename from tools/topology/topology1/development/sof-imx8-src-cs42888.m4 rename to tools/topology/topology1/sof-imx8-src-cs42888.m4 diff --git a/tools/topology/topology1/development/sof-imx8-src-wm8960.m4 b/tools/topology/topology1/sof-imx8-src-wm8960.m4 similarity index 100% rename from tools/topology/topology1/development/sof-imx8-src-wm8960.m4 rename to tools/topology/topology1/sof-imx8-src-wm8960.m4 diff --git a/tools/topology/topology1/development/sof-imx8mp-compr-pcm-cap-wm8960.m4 b/tools/topology/topology1/sof-imx8mp-compr-pcm-cap-wm8960.m4 similarity index 100% rename from tools/topology/topology1/development/sof-imx8mp-compr-pcm-cap-wm8960.m4 rename to tools/topology/topology1/sof-imx8mp-compr-pcm-cap-wm8960.m4 diff --git a/tools/topology/topology1/development/sof-imx8mp-compr-pcm-wm8960.m4 b/tools/topology/topology1/sof-imx8mp-compr-pcm-wm8960.m4 similarity index 100% rename from tools/topology/topology1/development/sof-imx8mp-compr-pcm-wm8960.m4 rename to tools/topology/topology1/sof-imx8mp-compr-pcm-wm8960.m4 diff --git a/tools/topology/topology1/development/sof-imx8mp-compr-wm8960.m4 b/tools/topology/topology1/sof-imx8mp-compr-wm8960.m4 similarity index 100% rename from tools/topology/topology1/development/sof-imx8mp-compr-wm8960.m4 rename to tools/topology/topology1/sof-imx8mp-compr-wm8960.m4