From 8ca07591c9786eb4c261d0e802f0ff286d4c8d84 Mon Sep 17 00:00:00 2001
From: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Date: Thu, 26 Oct 2023 12:15:10 +0300
Subject: [PATCH] Tools: Test: Topology: Avoid dependence to
 platform/intel/bxt.m4

A simplified copy of previous bxt.m4 is made as local
platform/generic.m4 with SSP and other platform definitions
for test topologies build. It is included to test-all,
test-capture, and test-playback macros definitions.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
---
 tools/test/topology/platform/generic.m4 | 60 +++++++++++++++++++++++++
 tools/test/topology/test-all.m4         |  4 +-
 tools/test/topology/test-capture.m4     |  5 +--
 tools/test/topology/test-playback.m4    |  4 +-
 4 files changed, 66 insertions(+), 7 deletions(-)
 create mode 100644 tools/test/topology/platform/generic.m4

diff --git a/tools/test/topology/platform/generic.m4 b/tools/test/topology/platform/generic.m4
new file mode 100644
index 000000000..49469d6b4
--- /dev/null
+++ b/tools/test/topology/platform/generic.m4
@@ -0,0 +1,60 @@
+#
+# Generic test platform values for pipelines and components
+#
+
+undefine(`SSP_MCLK_RATE')
+define(`SSP_MCLK_RATE', `19200000')
+
+undefine(`SSP1_BCLK')
+define(`SSP1_BCLK', `1536000')
+
+undefine(`SSP_BCLK')
+define(`SSP_BCLK', `1920000')
+
+undefine(`SSP_FSYNC')
+define(`SSP_FSYNC', `48000')
+
+define(`SSP1_VALID_BITS_STR', `s16le')
+
+undefine(`SSP_BITS_WIDTH')
+define(`SSP_BITS_WIDTH', `20')
+
+undefine(`SSP1_VALID_BITS')
+define(`SSP1_VALID_BITS', `16')
+
+undefine(`SSP_VALID_BITS')
+define(`SSP_VALID_BITS', `16')
+
+undefine(`MCLK_ID')
+define(`MCLK_ID', `1')
+
+include(`memory.m4')
+
+dnl Memory capabilities for different buffer types
+define(`PLATFORM_DAI_MEM_CAP',
+	MEMCAPS(MEM_CAP_RAM, MEM_CAP_DMA, MEM_CAP_CACHE, MEM_CAP_HP))
+define(`PLATFORM_HOST_MEM_CAP',
+	MEMCAPS(MEM_CAP_RAM, MEM_CAP_DMA, MEM_CAP_CACHE, MEM_CAP_HP))
+define(`PLATFORM_PASS_MEM_CAP',
+	MEMCAPS(MEM_CAP_RAM, MEM_CAP_DMA, MEM_CAP_CACHE, MEM_CAP_HP))
+define(`PLATFORM_COMP_MEM_CAP', MEMCAPS(MEM_CAP_RAM, MEM_CAP_CACHE))
+
+# Low Latency PCM Configuration
+W_VENDORTUPLES(pipe_ll_schedule_plat_tokens, sof_sched_tokens, LIST(`		', `SOF_TKN_SCHED_MIPS	"50000"'))
+
+W_DATA(pipe_ll_schedule_plat, pipe_ll_schedule_plat_tokens)
+
+# Media PCM Configuration
+W_VENDORTUPLES(pipe_media_schedule_plat_tokens, sof_sched_tokens, LIST(`		', `SOF_TKN_SCHED_MIPS	"100000"'))
+
+W_DATA(pipe_media_schedule_plat, pipe_media_schedule_plat_tokens)
+
+# Tone Signal Generator Configuration
+W_VENDORTUPLES(pipe_tone_schedule_plat_tokens, sof_sched_tokens, LIST(`		', `SOF_TKN_SCHED_MIPS	"200000"'))
+
+W_DATA(pipe_tone_schedule_plat, pipe_tone_schedule_plat_tokens)
+
+# DAI schedule Configuration - scheduled by IRQ
+W_VENDORTUPLES(pipe_dai_schedule_plat_tokens, sof_sched_tokens, LIST(`		', `SOF_TKN_SCHED_MIPS	"5000"'))
+
+W_DATA(pipe_dai_schedule_plat, pipe_dai_schedule_plat_tokens)
diff --git a/tools/test/topology/test-all.m4 b/tools/test/topology/test-all.m4
index 0187ba96d..e30df5d5f 100644
--- a/tools/test/topology/test-all.m4
+++ b/tools/test/topology/test-all.m4
@@ -14,8 +14,8 @@ include(`common/tlv.m4')
 # Include Token library
 include(`sof/tokens.m4')
 
-# Include Apollolake DSP configuration
-include(`platform/intel/bxt.m4')
+# Include generic DSP configuration
+include(`platform/generic.m4')
 
 DEBUG_START
 
diff --git a/tools/test/topology/test-capture.m4 b/tools/test/topology/test-capture.m4
index b7354544c..b5a8deb76 100644
--- a/tools/test/topology/test-capture.m4
+++ b/tools/test/topology/test-capture.m4
@@ -6,7 +6,6 @@
 include(`utils.m4')
 include(`dai.m4')
 include(`ssp.m4')
-include(`dmic.m4')
 include(`pipeline.m4')
 
 # Include TLV library
@@ -15,8 +14,8 @@ include(`common/tlv.m4')
 # Include Token library
 include(`sof/tokens.m4')
 
-# Include Apollolake DSP configuration
-include(`platform/intel/bxt.m4')
+# Include generic DSP configuration
+include(`platform/generic.m4')
 
 DEBUG_START
 
diff --git a/tools/test/topology/test-playback.m4 b/tools/test/topology/test-playback.m4
index 040058333..48ed1f26a 100644
--- a/tools/test/topology/test-playback.m4
+++ b/tools/test/topology/test-playback.m4
@@ -14,8 +14,8 @@ include(`common/tlv.m4')
 # Include Token library
 include(`sof/tokens.m4')
 
-# Include Apollolake DSP configuration
-include(`platform/intel/bxt.m4')
+# Include generic DSP configuration
+include(`platform/generic.m4')
 
 DEBUG_START