OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

topology1: fix errors due to newline in list generator 

The recent changes to the string parser in alsa-lib cause the topology
builds to break for some topologies. Avoid adding a newline for the bytes
data for the MUXDEMUX config by introducing a new macro for creating lists
without new lines between items.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
This commit is contained in:
Ranjani Sridharan 2021-12-05 21:03:26 -08:00 committed by Liam Girdwood
parent db041556ce
commit 3e1c160e50
9 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/topology/topology1/development/sof-apl-nocodec-demux-eq-2ch4ch.m4
View File

@ -41,7 +41,7 @@ define(matrix1, `ROUTE_MATRIX(1,
`BITS_TO_BYTE(0, 0, 0 ,0 ,0 ,0 ,0 ,0)')')
dnl name, num_streams, route_matrix list
MUXDEMUX_CONFIG(demux_priv_1, 1, LIST(` ', `matrix1'))
MUXDEMUX_CONFIG(demux_priv_1, 1, LIST_NONEWLINE(`', `matrix1'))
#
# Define the pipelines

2
tools/topology/topology1/development/sof-apl-nocodec-demux-eq-4ch4ch.m4
View File

@ -41,7 +41,7 @@ define(matrix1, `ROUTE_MATRIX(1,
`BITS_TO_BYTE(0, 0, 0 ,0 ,0 ,0 ,0 ,0)')')
dnl name, num_streams, route_matrix list
MUXDEMUX_CONFIG(demux_priv_1, 1, LIST(` ', `matrix1'))
MUXDEMUX_CONFIG(demux_priv_1, 1, LIST_NONEWLINE(`', `matrix1'))
#
# Define the pipelines

2
tools/topology/topology1/development/sof-tgl-nocodec-ci.m4
View File

@ -56,7 +56,7 @@ define(matrix2, `ROUTE_MATRIX(7,
`BITS_TO_BYTE(0, 0, 0 ,0 ,0 ,0 ,0 ,1)')')
dnl name, num_streams, route_matrix list
MUXDEMUX_CONFIG(demux_priv_1, 2, LIST(` ', `matrix1,', `matrix2'))
MUXDEMUX_CONFIG(demux_priv_1, 2, LIST_NONEWLINE(`', `matrix1,', `matrix2'))
#
# Define the pipelines

4
tools/topology/topology1/m4/utils.m4
View File

@ -19,8 +19,12 @@ dnl The first argument specifies the number of tabs to be added for formatting
define(`LIST_LOOP', `argn(j,$@)
$1ifelse(i,`2', `', `define(`i', decr(i))define(`j', incr(j))$0($@)')')
define(`LIST_LOOP_NONEWLINE', `argn(j,$@)$1ifelse(i,`2', `', `define(`i', decr(i))define(`j', incr(j))$0($@)')')
define(`LIST', `pushdef(`i', $#)pushdef(`j', `2')LIST_LOOP($@)popdef(i)popdef(j)')
define(`LIST_NONEWLINE', `pushdef(`i', $#)pushdef(`j', `2')LIST_LOOP_NONEWLINE($@)popdef(i)popdef(j)')
dnl Sums a list of variable arguments. Use as last argument in macro.
define(`SUM_LOOP', `eval(argn(j,$@)
ifelse(i,`1', `', `define(`i', decr(i)) define(`j', incr(j)) + $0($@)'))')

2
tools/topology/topology1/sof-adl-nau8825.m4
View File

@ -74,7 +74,7 @@ dnl There's a separate matrix for all outputs.
`BITS_TO_BYTE(0, 0, 0 ,0 ,0 ,0 ,0 ,1)')')'
dnl name, num_streams, route_matrix list
`MUXDEMUX_CONFIG(demux_priv_1, 2, LIST(` ', `matrix1,', `matrix2'))')
`MUXDEMUX_CONFIG(demux_priv_1, 2, LIST_NONEWLINE(`', `matrix1,', `matrix2'))')
ifdef(`NO_AMP',,`
ifdef(`SMART_AMP',`

2
tools/topology/topology1/sof-apl-demux-pcm512x.m4
View File

@ -49,7 +49,7 @@ define(matrix2, `ROUTE_MATRIX(5,
`BITS_TO_BYTE(0, 0, 0 ,0 ,0 ,0 ,0 ,1)')')
dnl name, num_streams, route_matrix list
MUXDEMUX_CONFIG(demux_priv_1, 2, LIST(` ', `matrix1,', `matrix2'))
MUXDEMUX_CONFIG(demux_priv_1, 2, LIST_NONEWLINE(`', `matrix1,', `matrix2'))
#
# Define the pipelines

2
tools/topology/topology1/sof-cml-demux-rt5682.m4
View File

@ -49,7 +49,7 @@ define(matrix2, `ROUTE_MATRIX(5,
`BITS_TO_BYTE(0, 0, 0 ,0 ,0 ,0 ,0 ,1)')')
dnl name, num_streams, route_matrix list
MUXDEMUX_CONFIG(demux_priv_1, 2, LIST(` ', `matrix1,', `matrix2'))
MUXDEMUX_CONFIG(demux_priv_1, 2, LIST_NONEWLINE(`', `matrix1,', `matrix2'))
#
# Define the pipelines

2
tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4
View File

@ -63,7 +63,7 @@ define(matrix2, `ROUTE_MATRIX(4,
`BITS_TO_BYTE(0, 0, 0 ,0 ,0 ,0 ,0 ,1)')')
dnl name, num_streams, route_matrix list
MUXDEMUX_CONFIG(demux_priv_3, 2, LIST(` ', `matrix1,', `matrix2'))
MUXDEMUX_CONFIG(demux_priv_3, 2, LIST_NONEWLINE(`', `matrix1,', `matrix2'))
')
#

4
tools/topology/topology1/sof-tgl-max98357a-rt5682.m4
View File

@ -63,8 +63,8 @@ define(matrix3, `ROUTE_MATRIX(1,
dnl name, num_streams, route_matrix list
ifdef(`2_WAY_SPK',
`MUXDEMUX_CONFIG(demux_priv_1, 1, LIST(`` '', `matrix3'))',
`MUXDEMUX_CONFIG(demux_priv_1, 2, LIST(`` '', `matrix1,', `matrix2'))')
`MUXDEMUX_CONFIG(demux_priv_1, 1, LIST_NONEWLINE(`', `matrix3'))',
`MUXDEMUX_CONFIG(demux_priv_1, 2, LIST_NONEWLINE(`', `matrix1,', `matrix2'))')
#
# Define the pipelines