topology: Use generic name for 8qxp/8qm

dbaluta · lgirdwood · commit 5ca0e9bba3e6 · 2021-04-28T20:11:19.000+01:00
i.MX8QXP / i.MX8QM have the same configuration w.r.t topology.
But since we firstly added support for 8qxp all the names use
8qxp and then for 8qm we just borrow the files but using the 8qxp
naming.

This sometimes might cause confusion. So, we group under the
umbrella of imx8 naming both i.mx8qxp and i.mx8qm.

Signed-off-by: Daniel Baluta &lt;daniel.baluta@nxp.com&gt;
diff --git a/tools/topology/CMakeLists.txt b/tools/topology/CMakeLists.txt
@@ -117,10 +117,10 @@ set(TPLGS
 	"sof-tgl-nocodec\;sof-ehl-nocodec"
 	"sof-ehl-rt5660\;sof-ehl-rt5660\;-DHDMI=1"
 	"sof-ehl-rt5660\;sof-ehl-rt5660-nohdmi"
-	"sof-imx8qxp-nocodec\;sof-imx8qxp-nocodec"
-	"sof-imx8qxp-cs42888\;sof-imx8qxp-cs42888"
-	"sof-imx8qxp-nocodec-sai\;sof-imx8qxp-nocodec-sai"
-	"sof-imx8qxp-wm8960\;sof-imx8qxp-wm8960"
+	"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-cs42888-mixer\;sof-imx8-cs42888-mixer"
 	"sof-imx8mp-wm8960-mixer\;sof-imx8mp-wm8960-mixer"
diff --git a/tools/topology/development/sof-imx8-src-cs42888.m4 b/tools/topology/development/sof-imx8-src-cs42888.m4
@@ -17,7 +17,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include DSP configuration
-include(`platform/imx/imx8qxp.m4')
+include(`platform/imx/imx8.m4')
 
 #
 # Define the pipelines
diff --git a/tools/topology/development/sof-imx8-src-wm8960.m4 b/tools/topology/development/sof-imx8-src-wm8960.m4
@@ -17,7 +17,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include DSP configuration
-include(`platform/imx/imx8qxp.m4')
+include(`platform/imx/imx8.m4')
 
 #
 # Define the pipelines
diff --git a/tools/topology/development/sof-imx8mp-src-wm8960.m4 b/tools/topology/development/sof-imx8mp-src-wm8960.m4
@@ -17,7 +17,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include DSP configuration
-include(`platform/imx/imx8qxp.m4')
+include(`platform/imx/imx8.m4')
 
 #
 # Define the pipelines
diff --git a/tools/topology/platform/imx/imx8.m4 b/tools/topology/platform/imx/imx8.m4
diff --git a/tools/topology/sof-imx8-cs42888-mixer.m4 b/tools/topology/sof-imx8-cs42888-mixer.m4
@@ -15,7 +15,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include DSP configuration
-include(`platform/imx/imx8qxp.m4')
+include(`platform/imx/imx8.m4')
 
 #
 # Define the pipelines
diff --git a/tools/topology/sof-imx8-cs42888.m4 b/tools/topology/sof-imx8-cs42888.m4
@@ -17,7 +17,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include DSP configuration
-include(`platform/imx/imx8qxp.m4')
+include(`platform/imx/imx8.m4')
 
 #
 # Define the pipelines
diff --git a/tools/topology/sof-imx8-nocodec-sai.m4 b/tools/topology/sof-imx8-nocodec-sai.m4
@@ -17,7 +17,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include DSP configuration
-include(`platform/imx/imx8qxp.m4')
+include(`platform/imx/imx8.m4')
 
 #
 # Define the pipelines
diff --git a/tools/topology/sof-imx8-nocodec.m4 b/tools/topology/sof-imx8-nocodec.m4
@@ -17,7 +17,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include DSP configuration
-include(`platform/imx/imx8qxp.m4')
+include(`platform/imx/imx8.m4')
 
 #
 # Define the pipelines
diff --git a/tools/topology/sof-imx8-wm8960-mixer.m4 b/tools/topology/sof-imx8-wm8960-mixer.m4
@@ -15,7 +15,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include DSP configuration
-include(`platform/imx/imx8qxp.m4')
+include(`platform/imx/imx8.m4')
 
 #
 # Define the pipelines
diff --git a/tools/topology/sof-imx8-wm8960.m4 b/tools/topology/sof-imx8-wm8960.m4
@@ -17,7 +17,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include DSP configuration
-include(`platform/imx/imx8qxp.m4')
+include(`platform/imx/imx8.m4')
 
 #
 # Define the pipelines
diff --git a/tools/topology/sof-imx8mp-wm8960-kwd.m4 b/tools/topology/sof-imx8mp-wm8960-kwd.m4
@@ -16,7 +16,7 @@ include(`sof/tokens.m4')
 
 include(`sai.m4')
 # Include i.MX8 DSP configuration
-include(`platform/imx/imx8qxp.m4')
+include(`platform/imx/imx8.m4')
 
 define(KWD_PIPE_SCH_DEADLINE_US, 20000)
 
diff --git a/tools/topology/sof-imx8mp-wm8960-mixer.m4 b/tools/topology/sof-imx8mp-wm8960-mixer.m4
@@ -15,7 +15,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include DSP configuration
-include(`platform/imx/imx8qxp.m4')
+include(`platform/imx/imx8.m4')
 
 #
 # Define the pipelines
diff --git a/tools/topology/sof-imx8mp-wm8960.m4 b/tools/topology/sof-imx8mp-wm8960.m4
@@ -17,7 +17,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include DSP configuration
-include(`platform/imx/imx8qxp.m4')
+include(`platform/imx/imx8.m4')
 
 #
 # Define the pipelines

Original file line number	Diff line number	Diff line change
@@ -17,7 +17,7 @@ include(`common/tlv.m4')
`17`	`17`	include(`sof/tokens.m4')
`18`	`18`
`19`	`19`	`# Include DSP configuration`
`20`		-include(`platform/imx/imx8qxp.m4')
	`20`	+include(`platform/imx/imx8.m4')
`21`	`21`
`22`	`22`	`#`
`23`	`23`	`# Define the pipelines`
Original file line number	Diff line number	Diff line change
@@ -15,7 +15,7 @@ include(`common/tlv.m4')
`15`	`15`	include(`sof/tokens.m4')
`16`	`16`
`17`	`17`	`# Include DSP configuration`
`18`		-include(`platform/imx/imx8qxp.m4')
	`18`	+include(`platform/imx/imx8.m4')
`19`	`19`
`20`	`20`	`#`
`21`	`21`	`# Define the pipelines`