topology: fix semi-abandoned Chrome topologies

we have a set of topologies that don't seem aligned with the
mainstream ones.

All these topologies should be given the boot if they are not used.

FIXME: The case of tools/topology/sof-cml-rt5682-kwd.m4 is rather
strange, M4 seems to go in some sort of infinite recursion if
'DMIC16k' is defined.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

tools/topology/sof-apl-keyword-detect.m4

@@ -20,6 +20,8 @@ include(`platform/intel/dmic.m4')
 
 define(KWD_PIPE_SCH_DEADLINE_US, 20000)
 
+define(DMIC_16k_PCM_NAME, `DMIC16k')
+
 #
 # Define the pipelines
 #

tools/topology/sof-cml-rt1011-rt5682.m4

@@ -6,6 +6,8 @@
 # Note: DMIC16KPROC is hard coded in sof-cml-rt5682-kwd.m4
 ifdef(`DMICPROC', , `define(DMICPROC, passthrough)')
 
+define(DMIC_16k_PCM_NAME, `DMIC16k')
+
 # Include SOF CML RT5682 Topology
 # This includes topology for RT5682, DMIC and 3 HDMI Pass through pipeline
 include(`sof-cml-rt5682-kwd.m4')

tools/topology/sof-cml-rt5682-kwd.m4

@@ -29,6 +29,9 @@ ifdef(`HSEARPROC', , `define(HSEARPROC, volume)')
 ifdef(`DMICPROC', , `define(DMICPROC, passthrough)')
 ifdef(`DMIC16KPROC', , `define(DMIC16KPROC, passthrough)')
 
+# FIXME: Using DMIC16kHz instead of DMIC16k, otherwise M4 does not return.
+define(DMIC_16k_PCM_NAME, DMIC16kHz)
+
 #
 # Define the pipelines
 #

tools/topology/sof-glk-da7219-kwd.m4

@@ -19,6 +19,8 @@ include(`sof/tokens.m4')
 # include platform specific dsp configuration and machine specific settings
 include(`platform/intel/'PLATFORM`-da7219.m4')
 
+define(DMIC_16k_PCM_NAME, `DMIC16k')
+
 define(KWD_PIPE_SCH_DEADLINE_US, 20000)
 
 #