topology2: Remove the cavs folder

This folder contains definitions for both CAVS and ACE. So remove the
incorrect folder naming and move everything one level up.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

Author: ranj063

tools/topology/topology2/avs-tplg/CMakeLists.txt

@@ -44,8 +44,8 @@ foreach(tplg ${TPLGS})
 	endif()
 
 	add_alsatplg2_command("${CMAKE_CURRENT_BINARY_DIR}/../abi.conf" abi_target
-	  "${CMAKE_CURRENT_SOURCE_DIR}/../cavs/${input}" "${output}"
-	  "${CMAKE_CURRENT_SOURCE_DIR}/../cavs" "${defines}")
+	  "${CMAKE_CURRENT_SOURCE_DIR}/../${input}" "${output}"
+	  "${CMAKE_CURRENT_SOURCE_DIR}/../" "${defines}")
 
 	add_custom_target(topology2_avs_${output} DEPENDS ${output}.tplg)
 	add_dependencies(topology2_cavs topology2_avs_${output})

…opology2/cavs/cavs-mixin-mixout-hda.conf …ogy/topology2/cavs-mixin-mixout-hda.conftools/topology/topology2/cavs/cavs-mixin-mixout-hda.conf renamed to tools/topology/topology2/cavs-mixin-mixout-hda.conf tools/topology/topology2/cavs/cavs-mixin-mixout-hda.conf renamed to tools/topology/topology2/cavs-mixin-mixout-hda.conf

@@ -1,10 +1,9 @@
-<searchdir:cavs>
 <searchdir:include>
 <searchdir:include/common>
 <searchdir:include/components>
 <searchdir:include/dais>
 <searchdir:include/pipelines/cavs>
-<searchdir:cavs/platform/intel>
+<searchdir:platform/intel>
 
 <vendor-token.conf>
 <manifest.conf>
@@ -24,7 +23,7 @@
 <hw_config.conf>
 <manifest.conf>
 <route.conf>
-<cavs/common_definitions.conf>
+<common_definitions.conf>
 <copier.conf>
 <pipeline.conf>
 <dai.conf>

…opology/topology2/cavs/cavs-nocodec.conf …ols/topology/topology2/cavs-nocodec.conftools/topology/topology2/cavs/cavs-nocodec.conf renamed to tools/topology/topology2/cavs-nocodec.conf tools/topology/topology2/cavs/cavs-nocodec.conf renamed to tools/topology/topology2/cavs-nocodec.conf

@@ -3,7 +3,7 @@
 <searchdir:include/components>
 <searchdir:include/dais>
 <searchdir:include/pipelines/cavs>
-<searchdir:cavs/platform/intel>
+<searchdir:platform/intel>
 
 <vendor-token.conf>
 <tokens.conf>
@@ -26,7 +26,7 @@
 <hw_config.conf>
 <manifest.conf>
 <route.conf>
-<cavs/common_definitions.conf>
+<common_definitions.conf>
 <dmic-default.conf>
 <hdmi-default.conf>
 

…opology2/cavs/cavs-passthrough-hdmi.conf …ogy/topology2/cavs-passthrough-hdmi.conftools/topology/topology2/cavs/cavs-passthrough-hdmi.conf renamed to tools/topology/topology2/cavs-passthrough-hdmi.conf tools/topology/topology2/cavs/cavs-passthrough-hdmi.conf renamed to tools/topology/topology2/cavs-passthrough-hdmi.conf

@@ -1,4 +1,3 @@
-<searchdir:cavs>
 <searchdir:include>
 <searchdir:include/common>
 <searchdir:include/components>
@@ -22,7 +21,7 @@
 <hw_config.conf>
 <manifest.conf>
 <route.conf>
-<cavs/common_definitions.conf>
+<common_definitions.conf>
 <copier.conf>
 <pipeline.conf>
 <dai.conf>

…ology2/cavs/cavs-sdw-src-gain-mixin.conf …y/topology2/cavs-sdw-src-gain-mixin.conftools/topology/topology2/cavs/cavs-sdw-src-gain-mixin.conf renamed to tools/topology/topology2/cavs-sdw-src-gain-mixin.conf tools/topology/topology2/cavs/cavs-sdw-src-gain-mixin.conf renamed to tools/topology/topology2/cavs-sdw-src-gain-mixin.conf

@@ -1,10 +1,9 @@
-<searchdir:cavs>
 <searchdir:include>
 <searchdir:include/common>
 <searchdir:include/components>
 <searchdir:include/dais>
 <searchdir:include/pipelines/cavs>
-<searchdir:cavs/platform/intel>
+<searchdir:platform/intel>
 
 <vendor-token.conf>
 <pdm_config.conf>
@@ -26,7 +25,7 @@
 <hw_config.conf>
 <manifest.conf>
 <route.conf>
-<cavs/common_definitions.conf>
+<common_definitions.conf>
 <copier.conf>
 <pipeline.conf>
 <dai.conf>

…ls/topology/topology2/cavs/cavs-sdw.conf tools/topology/topology2/cavs-sdw.conftools/topology/topology2/cavs/cavs-sdw.conf renamed to tools/topology/topology2/cavs-sdw.conf tools/topology/topology2/cavs/cavs-sdw.conf renamed to tools/topology/topology2/cavs-sdw.conf

@@ -15,7 +15,7 @@
 #
 # Where N is the unique pipeline ID within the same alsaconf node.
 #
-<cavs/common_definitions.conf>
+<common_definitions.conf>
 <include/common/audio_format.conf>
 <include/components/copier.conf>
 <include/components/gain.conf>