topology: move platform m4 files from dsps directory to platform/intel

ranj063 · ranj063 · commit a835ff2ae962 · 2018-06-25T13:44:52.000-07:00
Signed-off-by: Ranjani Sridharan &lt;ranjani.sridharan@linux.intel.com&gt;
diff --git a/configure.ac b/configure.ac
@@ -20,7 +20,8 @@ AC_OUTPUT([
 	rmbox/Makefile
 	topology/Makefile
 	topology/common/Makefile
-	topology/dsps/Makefile
+	topology/platform/Makefile
+	topology/platform/intel/Makefile
 	topology/m4/Makefile
 	topology/sof/Makefile
 	topology/test/Makefile
diff --git a/topology/Makefile.am b/topology/Makefile.am
@@ -3,10 +3,10 @@
 # Dependencies
 #
 
-SUBDIRS = test m4 sof common dsps
+SUBDIRS = test m4 sof common platform
 
 DEPS = \
-	dsps/*.m4 \
+	platform/intel/*.m4 \
 	common/*.m4 \
 	m4/*.m4 \
 	sof/*.m4
diff --git a/topology/platform/Makefile.am b/topology/platform/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = intel
diff --git a/topology/platform/intel/Makefile.am b/topology/platform/intel/Makefile.am
diff --git a/topology/platform/intel/bdw.m4 b/topology/platform/intel/bdw.m4
diff --git a/topology/platform/intel/bxt.m4 b/topology/platform/intel/bxt.m4
diff --git a/topology/platform/intel/byt.m4 b/topology/platform/intel/byt.m4
diff --git a/topology/platform/intel/cht.m4 b/topology/platform/intel/cht.m4
diff --git a/topology/platform/intel/cnl.m4 b/topology/platform/intel/cnl.m4
diff --git a/topology/platform/intel/hsw.m4 b/topology/platform/intel/hsw.m4
diff --git a/topology/sof-apl-nocodec.m4 b/topology/sof-apl-nocodec.m4
@@ -14,7 +14,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include Apollolake DSP configuration
-include(`dsps/bxt.m4')
+include(`platform/intel/bxt.m4')
 
 #
 # Define the pipelines
diff --git a/topology/sof-apl-tdf8532.m4 b/topology/sof-apl-tdf8532.m4
@@ -14,7 +14,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include Apollolake DSP configuration
-include(`dsps/bxt.m4')
+include(`platform/intel/bxt.m4')
 
 #
 # Define the pipelines
diff --git a/topology/sof-bdw-rt286.m4 b/topology/sof-bdw-rt286.m4
@@ -14,7 +14,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include Broadwell DSP configuration
-include(`dsps/bdw.m4')
+include(`platform/intel/bdw.m4')
 
 #
 # Define the pipelines
diff --git a/topology/sof-bdw-rt5640.m4 b/topology/sof-bdw-rt5640.m4
@@ -14,7 +14,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include Broadwell DSP configuration
-include(`dsps/bdw.m4')
+include(`platform/intel/bdw.m4')
 
 #
 # Define the pipelines
diff --git a/topology/sof-byt-da7213.m4 b/topology/sof-byt-da7213.m4
@@ -14,7 +14,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include Baytrail DSP configuration
-include(`dsps/byt.m4')
+include(`platform/intel/byt.m4')
 
 #
 # Define the pipelines
diff --git a/topology/sof-byt-nocodec.m4 b/topology/sof-byt-nocodec.m4
@@ -14,7 +14,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include Baytrail DSP configuration
-include(`dsps/byt.m4')
+include(`platform/intel/byt.m4')
 
 #
 # Define the pipelines
diff --git a/topology/sof-byt-rt5640.m4 b/topology/sof-byt-rt5640.m4
@@ -14,7 +14,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include Baytrail DSP configuration
-include(`dsps/byt.m4')
+include(`platform/intel/byt.m4')
 
 #
 # Define the pipelines
diff --git a/topology/sof-byt-rt5645.m4 b/topology/sof-byt-rt5645.m4
@@ -14,7 +14,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include Baytrail DSP configuration
-include(`dsps/byt.m4')
+include(`platform/intel/byt.m4')
 
 #
 # Define the pipelines
diff --git a/topology/sof-byt-rt5651.m4 b/topology/sof-byt-rt5651.m4
@@ -14,7 +14,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include Baytrail DSP configuration
-include(`dsps/byt.m4')
+include(`platform/intel/byt.m4')
 
 #
 # Define the pipelines
diff --git a/topology/sof-cht-max98090.m4 b/topology/sof-cht-max98090.m4
@@ -14,7 +14,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include Cherrytrail DSP configuration
-include(`dsps/cht.m4')
+include(`platform/intel/cht.m4')
 
 #
 # Define the pipelines
diff --git a/topology/sof-cht-nocodec.m4 b/topology/sof-cht-nocodec.m4
@@ -14,7 +14,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include CherryTrail DSP configuration
-include(`dsps/cht.m4')
+include(`platform/intel/cht.m4')
 
 #
 # Define the pipelines
diff --git a/topology/sof-cnl-rt274.m4 b/topology/sof-cnl-rt274.m4
@@ -14,7 +14,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include Apollolake DSP configuration
-include(`dsps/cnl.m4')
+include(`platform/intel/cnl.m4')
 
 #
 # Define the pipelines
diff --git a/topology/sof-hsw-rt5640.m4 b/topology/sof-hsw-rt5640.m4
@@ -14,7 +14,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include Haswell DSP configuration
-include(`dsps/hsw.m4')
+include(`platform/intel/hsw.m4')
 
 #
 # Define the pipelines
diff --git a/topology/test/Makefile.am b/topology/test/Makefile.am
@@ -8,7 +8,7 @@ export USE_XARGS=yes
 endif
 
 DEPS = \
-	../dsps/*.m4 \
+	../platform/intel/*.m4 \
 	../common/*.m4 \
 	../m4/*.m4 \
 	../sof/*.m4
diff --git a/topology/test/test-all.m4 b/topology/test/test-all.m4
@@ -14,7 +14,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include Baytrail DSP configuration
-include(`dsps/byt.m4')
+include(`byt.m4')
 
 #
 # Machine Specific Config - !! MUST BE SET TO MATCH TEST MACHINE DRIVER !!
diff --git a/topology/test/test-capture.m4 b/topology/test/test-capture.m4
@@ -14,7 +14,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include Baytrail DSP configuration
-include(`dsps/byt.m4')
+include(`byt.m4')
 
 #
 # Machine Specific Config - !! MUST BE SET TO MATCH TEST MACHINE DRIVER !!
diff --git a/topology/test/test-playback.m4 b/topology/test/test-playback.m4
@@ -14,7 +14,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include Baytrail DSP configuration
-include(`dsps/byt.m4')
+include(`byt.m4')
 
 #
 # Machine Specific Config - !! MUST BE SET TO MATCH TEST MACHINE DRIVER !!
diff --git a/topology/test/test-tone-playback.m4 b/topology/test/test-tone-playback.m4
@@ -14,7 +14,7 @@ include(`common/tlv.m4')
 include(`sof/tokens.m4')
 
 # Include Baytrail DSP configuration
-include(`dsps/byt.m4')
+include(`byt.m4')
 
 #
 # Machine Specific Config - !! MUST BE SET TO MATCH TEST MACHINE DRIVER !!
diff --git a/topology/test/tplg-build.sh b/topology/test/tplg-build.sh
@@ -8,7 +8,7 @@
 set -e
 
 # M4 preprocessor flags
-export M4PATH="../:../m4:../common"
+export M4PATH="../:../m4:../common:../platform/intel"
 
 # Simple component test cases
 # can be used on components with 1 sink and 1 source.
