llext: mtl: generate fully modular configuration

Add a FORCE_ALL_MODULES macro to mtl.toml.h. When this header is then preprocessed with that macro defined, all module TOML files will be included. This then can be used to generate module libraries, which we also enable in this patch. Signed-off-by: Guennadi Liakhovetski <[email protected]>
lyakh · Dec 10, 2024 · f53197f · f53197f
1 parent 5b082eb
commit f53197f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 24 deletions.
diff --git a/app/boards/intel_adsp_ace15_mtpm.conf b/app/boards/intel_adsp_ace15_mtpm.conf
@@ -52,6 +52,7 @@ CONFIG_INTEL_MODULES=y
 CONFIG_LIBRARY_MANAGER=y
 CONFIG_LIBRARY_AUTH_SUPPORT=y
 CONFIG_LIBRARY_BASE_ADDRESS=0xa0688000
+CONFIG_LIBRARY_BUILD_LIB=y
 
 # SOF / logging
 CONFIG_SOF_LOG_LEVEL_INF=y

diff --git a/tools/rimage/config/mtl.toml.h b/tools/rimage/config/mtl.toml.h
@@ -24,111 +24,111 @@
 
 	index = __COUNTER__
 
-#ifdef CONFIG_COMP_MIXIN_MIXOUT
+#if defined(CONFIG_COMP_MIXIN_MIXOUT) || defined(LLEXT_FORCE_ALL_MODULES)
 #include <audio/mixin_mixout/mixin_mixout.toml>
 #endif
 
-#ifdef CONFIG_COMP_COPIER
+#if defined(CONFIG_COMP_COPIER) || defined(LLEXT_FORCE_ALL_MODULES)
 #include <audio/copier/copier.toml>
 #endif
 
-#ifdef CONFIG_COMP_VOLUME
+#if defined(CONFIG_COMP_VOLUME) || defined(LLEXT_FORCE_ALL_MODULES)
 #include <audio/volume/volume.toml>
 #endif
 
-#ifdef CONFIG_COMP_ASRC
+#if defined(CONFIG_COMP_ASRC) || defined(LLEXT_FORCE_ALL_MODULES)
 #include <audio/asrc/asrc.toml>
 #endif
 
-#ifdef CONFIG_COMP_SRC
+#if defined(CONFIG_COMP_SRC) || defined(LLEXT_FORCE_ALL_MODULES)
 #include <audio/src/src.toml>
 #endif
 
-#ifdef CONFIG_COMP_SEL
+#if defined(CONFIG_COMP_SEL) || defined(LLEXT_FORCE_ALL_MODULES)
 #include <audio/selector/selector.toml>
 #endif
 
-#ifdef CONFIG_COMP_UP_DOWN_MIXER
+#if defined(CONFIG_COMP_UP_DOWN_MIXER) || defined(LLEXT_FORCE_ALL_MODULES)
 #include <audio/up_down_mixer/up_down_mixer.toml>
 #endif
 
 #ifdef CONFIG_PROBE
 #include <probe/probe.toml>
 #endif
 
-#ifdef CONFIG_COMP_MUX
+#if defined(CONFIG_COMP_MUX) || defined(LLEXT_FORCE_ALL_MODULES)
 #include <audio/mux/mux.toml>
 #endif
 
 #ifdef CONFIG_SAMPLE_KEYPHRASE
 #include <samples/audio/detect_test.toml>
 #endif
 
-#ifdef CONFIG_COMP_KPB
+#if defined(CONFIG_COMP_KPB) || defined(LLEXT_FORCE_ALL_MODULES)
 #include <audio/kpb.toml>
 #endif
 
-#ifdef CONFIG_SAMPLE_SMART_AMP
+#if defined(CONFIG_SAMPLE_SMART_AMP) || defined(LLEXT_FORCE_ALL_MODULES)
 #include <samples/audio/smart_amp_test.toml>
 #endif
 
-#ifdef CONFIG_COMP_IIR
+#if defined(CONFIG_COMP_IIR) || defined(LLEXT_FORCE_ALL_MODULES)
 #include <audio/eq_iir/eq_iir.toml>
 #endif
 
-#ifdef CONFIG_COMP_FIR
+#if defined(CONFIG_COMP_FIR) || defined(LLEXT_FORCE_ALL_MODULES)
 #include <audio/eq_fir/eq_fir.toml>
 #endif
 
-#ifdef CONFIG_COMP_ARIA
+#if defined(CONFIG_COMP_ARIA) || defined(LLEXT_FORCE_ALL_MODULES)
 #include <audio/aria/aria.toml>
 #endif
 
-#ifdef CONFIG_COMP_DRC
+#if defined(CONFIG_COMP_DRC) || defined(LLEXT_FORCE_ALL_MODULES)
 #include <audio/drc/drc.toml>
 #endif
 
-#ifdef CONFIG_COMP_CROSSOVER
+#if defined(CONFIG_COMP_CROSSOVER) || defined(LLEXT_FORCE_ALL_MODULES)
 #include <audio/crossover/crossover.toml>
 #endif
 
-#ifdef CONFIG_COMP_MULTIBAND_DRC
+#if defined(CONFIG_COMP_MULTIBAND_DRC) || defined(LLEXT_FORCE_ALL_MODULES)
 #include <audio/multiband_drc/multiband_drc.toml>
 #endif
 
-#ifdef CONFIG_COMP_DCBLOCK
+#if defined(CONFIG_COMP_DCBLOCK) || defined(LLEXT_FORCE_ALL_MODULES)
 #include <audio/dcblock/dcblock.toml>
 #endif
 
-#ifdef CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING
+#if defined(CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING) || defined(LLEXT_FORCE_ALL_MODULES)
 #include <audio/google/google_rtc_audio_processing.toml>
 #endif
 
-#ifdef CONFIG_COMP_GOOGLE_CTC_AUDIO_PROCESSING
+#if defined(CONFIG_COMP_GOOGLE_CTC_AUDIO_PROCESSING) || defined(LLEXT_FORCE_ALL_MODULES)
 #include <audio/google/google_ctc_audio_processing.toml>
 #endif
 
-#ifdef CONFIG_COMP_TDFB
+#if defined(CONFIG_COMP_TDFB) || defined(LLEXT_FORCE_ALL_MODULES)
 #include <audio/tdfb/tdfb.toml>
 #endif
 
-#ifdef CONFIG_DTS_CODEC
+#if defined(CONFIG_DTS_CODEC) || defined(LLEXT_FORCE_ALL_MODULES)
 #include <audio/codec/dts/dts.toml>
 #endif
 
 #ifdef CONFIG_CADENCE_CODEC
 #include <audio/module_adapter/module/cadence.toml>
 #endif
 
-#ifdef CONFIG_COMP_RTNR
+#if defined(CONFIG_COMP_RTNR) || defined(LLEXT_FORCE_ALL_MODULES)
 #include <audio/rtnr/rtnr.toml>
 #endif
 
-#ifdef CONFIG_COMP_IGO_NR
+#if defined(CONFIG_COMP_IGO_NR) || defined(LLEXT_FORCE_ALL_MODULES)
 #include <audio/igo_nr/igo_nr.toml>
 #endif
 
-#ifdef CONFIG_COMP_MFCC
+#if defined(CONFIG_COMP_MFCC) || defined(LLEXT_FORCE_ALL_MODULES)
 #include <audio/mfcc/mfcc.toml>
 #endif