Skip to content

Commit 6b2712d

Browse files
ranj063ujfalusi
authored andcommitted
rimage: config: toml: lnl/mtl/nvl/ptl/tgl/tgl-h/wcl: Include cadence module if enabled
Include the cadence.toml if CONFIG_CADENCE_CODEC is enabled. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Co-developed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
1 parent 3e38b64 commit 6b2712d

7 files changed

Lines changed: 28 additions & 4 deletions

File tree

tools/rimage/config/lnl.toml.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@
6262
#include <audio/src/src.toml>
6363
#endif
6464

65+
#if defined(CONFIG_CADENCE_CODEC) || defined(LLEXT_FORCE_ALL_MODULAR)
66+
#include <audio/module_adapter/module/cadence.toml>
67+
#endif
68+
6569
#if defined(CONFIG_COMP_SEL) || defined(LLEXT_FORCE_ALL_MODULAR)
6670
#include <audio/selector/selector.toml>
6771
#endif

tools/rimage/config/mtl.toml.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,10 @@
7878
#include <audio/mux/mux.toml>
7979
#endif
8080

81+
#if defined(CONFIG_CADENCE_CODEC) || defined(LLEXT_FORCE_ALL_MODULAR)
82+
#include <audio/module_adapter/module/cadence.toml>
83+
#endif
84+
8185
#ifdef CONFIG_SAMPLE_KEYPHRASE
8286
#include <samples/audio/detect_test.toml>
8387
#endif
@@ -138,10 +142,6 @@
138142
#include <audio/codec/dts/dts.toml>
139143
#endif
140144

141-
#ifdef CONFIG_CADENCE_CODEC
142-
#include <audio/module_adapter/module/cadence.toml>
143-
#endif
144-
145145
#if defined(CONFIG_WAVES_CODEC) || defined(LLEXT_FORCE_ALL_MODULAR)
146146
#include <audio/module_adapter/module/waves/waves.toml>
147147
#endif

tools/rimage/config/nvl.toml.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ index = __COUNTER__
6262
#include <audio/src/src.toml>
6363
#endif
6464

65+
#if defined(CONFIG_CADENCE_CODEC) || defined(LLEXT_FORCE_ALL_MODULAR)
66+
#include <audio/module_adapter/module/cadence.toml>
67+
#endif
68+
6569
#if defined(CONFIG_COMP_SEL) || defined(LLEXT_FORCE_ALL_MODULAR)
6670
#include <audio/selector/selector.toml>
6771
#endif

tools/rimage/config/ptl.toml.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ index = __COUNTER__
6262
#include <audio/src/src.toml>
6363
#endif
6464

65+
#if defined(CONFIG_CADENCE_CODEC) || defined(LLEXT_FORCE_ALL_MODULAR)
66+
#include <audio/module_adapter/module/cadence.toml>
67+
#endif
68+
6569
#if defined(CONFIG_COMP_SEL) || defined(LLEXT_FORCE_ALL_MODULAR)
6670
#include <audio/selector/selector.toml>
6771
#endif

tools/rimage/config/tgl-h.toml.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@
4444
#include <audio/src/src.toml>
4545
#endif
4646

47+
#if defined(CONFIG_CADENCE_CODEC) || defined(LLEXT_FORCE_ALL_MODULAR)
48+
#include <audio/module_adapter/module/cadence.toml>
49+
#endif
50+
4751
#if defined(CONFIG_SAMPLE_SMART_AMP) || defined(LLEXT_FORCE_ALL_MODULAR)
4852
#include <samples/audio/smart_amp_test.toml>
4953
#endif

tools/rimage/config/tgl.toml.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@
4444
#include <audio/src/src.toml>
4545
#endif
4646

47+
#if defined(CONFIG_CADENCE_CODEC) || defined(LLEXT_FORCE_ALL_MODULAR)
48+
#include <audio/module_adapter/module/cadence.toml>
49+
#endif
50+
4751
#if defined(CONFIG_SAMPLE_SMART_AMP) || defined(LLEXT_FORCE_ALL_MODULAR)
4852
#include <samples/audio/smart_amp_test.toml>
4953
#endif

tools/rimage/config/wcl.toml.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ index = __COUNTER__
6262
#include <audio/src/src.toml>
6363
#endif
6464

65+
#if defined(CONFIG_CADENCE_CODEC) || defined(LLEXT_FORCE_ALL_MODULAR)
66+
#include <audio/module_adapter/module/cadence.toml>
67+
#endif
68+
6569
#if defined(CONFIG_COMP_SEL) || defined(LLEXT_FORCE_ALL_MODULAR)
6670
#include <audio/selector/selector.toml>
6771
#endif

0 commit comments

Comments
 (0)