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 <[email protected]>
thesofproject · Oct 21, 2024 · b1d4c90 · b1d4c90
1 parent edd20ae
commit b1d4c90
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 18 deletions.
diff --git 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
@@ -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/...elopment/sof-imx8-compr-pcm-cap-wm8960.m4 → ...opology1/sof-imx8-compr-pcm-cap-wm8960.m4 b/...elopment/sof-imx8-compr-pcm-cap-wm8960.m4 → ...opology1/sof-imx8-compr-pcm-cap-wm8960.m4
diff --git a/.../development/sof-imx8-compr-pcm-wm8960.m4 → ...gy/topology1/sof-imx8-compr-pcm-wm8960.m4 b/.../development/sof-imx8-compr-pcm-wm8960.m4 → ...gy/topology1/sof-imx8-compr-pcm-wm8960.m4
diff --git a/...ogy1/development/sof-imx8-compr-wm8960.m4 → ...pology/topology1/sof-imx8-compr-wm8960.m4 b/...ogy1/development/sof-imx8-compr-wm8960.m4 → ...pology/topology1/sof-imx8-compr-wm8960.m4
diff --git a/...logy1/development/sof-imx8-src-cs42888.m4 → ...opology/topology1/sof-imx8-src-cs42888.m4 b/...logy1/development/sof-imx8-src-cs42888.m4 → ...opology/topology1/sof-imx8-src-cs42888.m4
diff --git a/...ology1/development/sof-imx8-src-wm8960.m4 → ...topology/topology1/sof-imx8-src-wm8960.m4 b/...ology1/development/sof-imx8-src-wm8960.m4 → ...topology/topology1/sof-imx8-src-wm8960.m4
diff --git a/...opment/sof-imx8mp-compr-pcm-cap-wm8960.m4 → ...ology1/sof-imx8mp-compr-pcm-cap-wm8960.m4 b/...opment/sof-imx8mp-compr-pcm-cap-wm8960.m4 → ...ology1/sof-imx8mp-compr-pcm-cap-wm8960.m4
diff --git a/...evelopment/sof-imx8mp-compr-pcm-wm8960.m4 → .../topology1/sof-imx8mp-compr-pcm-wm8960.m4 b/...evelopment/sof-imx8mp-compr-pcm-wm8960.m4 → .../topology1/sof-imx8mp-compr-pcm-wm8960.m4
diff --git a/...y1/development/sof-imx8mp-compr-wm8960.m4 → ...logy/topology1/sof-imx8mp-compr-wm8960.m4 b/...y1/development/sof-imx8mp-compr-wm8960.m4 → ...logy/topology1/sof-imx8mp-compr-wm8960.m4