Skip to content

Commit 6522c55

Browse files
lyakhlgirdwood
authored andcommitted
llext: ptl: build libraries when using modules
Add a FORCE_ALL_MODULES macro to ptl.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 while also making it the default build configuration. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
1 parent d4e57e7 commit 6522c55

2 files changed

Lines changed: 28 additions & 22 deletions

File tree

app/boards/intel_adsp_ace30_ptl.conf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ CONFIG_ZEPHYR_NATIVE_DRIVERS=y
3636
# SOF / loadable modules
3737
CONFIG_INTEL_MODULES=y
3838
CONFIG_LIBRARY_MANAGER=y
39+
CONFIG_LIBRARY_BASE_ADDRESS=0xa0688000
40+
CONFIG_LIBRARY_BUILD_LIB=y
41+
CONFIG_LIBRARY_DEFAULT_MODULAR=y
3942

4043
# SOF / logging
4144
CONFIG_SOF_LOG_LEVEL_INF=y
@@ -44,6 +47,9 @@ CONFIG_SOF_LOG_LEVEL_INF=y
4447
CONFIG_COUNTER=y
4548
CONFIG_HEAP_MEM_POOL_SIZE=8192
4649
CONFIG_L3_HEAP=y
50+
CONFIG_LLEXT=y
51+
CONFIG_LLEXT_STORAGE_WRITABLE=y
52+
CONFIG_MODULES=y
4753

4854
# Zephyr / device drivers
4955
CONFIG_CLOCK_CONTROL=y

tools/rimage/config/ptl.toml.h

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -38,99 +38,99 @@ auto_start = "0"
3838

3939
index = __COUNTER__
4040

41-
#ifdef CONFIG_COMP_MIXIN_MIXOUT
41+
#if defined(CONFIG_COMP_MIXIN_MIXOUT) || defined(LLEXT_FORCE_ALL_MODULAR)
4242
#include <audio/mixin_mixout/mixin_mixout.toml>
4343
#endif
4444

45-
#ifdef CONFIG_COMP_COPIER
45+
#if defined(CONFIG_COMP_COPIER) || defined(LLEXT_FORCE_ALL_MODULAR)
4646
#include <audio/copier/copier.toml>
4747
#endif
4848

49-
#ifdef CONFIG_COMP_VOLUME
49+
#if defined(CONFIG_COMP_VOLUME) || defined(LLEXT_FORCE_ALL_MODULAR)
5050
#include <audio/volume/volume.toml>
5151
#endif
5252

53-
#ifdef CONFIG_COMP_ASRC
53+
#if defined(CONFIG_COMP_ASRC) || defined(LLEXT_FORCE_ALL_MODULAR)
5454
#include <audio/asrc/asrc.toml>
5555
#endif
5656

57-
#ifdef CONFIG_COMP_SRC
57+
#if defined(CONFIG_COMP_SRC) || defined(LLEXT_FORCE_ALL_MODULAR)
5858
#include <audio/src/src.toml>
5959
#endif
6060

61-
#ifdef CONFIG_COMP_SEL
61+
#if defined(CONFIG_COMP_SEL) || defined(LLEXT_FORCE_ALL_MODULAR)
6262
#include <audio/selector/selector.toml>
6363
#endif
6464

65-
#ifdef CONFIG_COMP_UP_DOWN_MIXER
65+
#if defined(CONFIG_COMP_UP_DOWN_MIXER) || defined(LLEXT_FORCE_ALL_MODULAR)
6666
#include <audio/up_down_mixer/up_down_mixer.toml>
6767
#endif
6868

6969
#ifdef CONFIG_PROBE
7070
#include <probe/probe.toml>
7171
#endif
7272

73-
#ifdef CONFIG_COMP_MUX
73+
#if defined(CONFIG_COMP_MUX) || defined(LLEXT_FORCE_ALL_MODULAR)
7474
#include <audio/mux/mux.toml>
7575
#endif
7676

7777
#ifdef CONFIG_SAMPLE_KEYPHRASE
7878
#include <samples/audio/detect_test.toml>
7979
#endif
8080

81-
#ifdef CONFIG_COMP_KPB
81+
#if defined(CONFIG_COMP_KPB) || defined(LLEXT_FORCE_ALL_MODULAR)
8282
#include <audio/kpb.toml>
8383
#endif
8484

85-
#ifdef CONFIG_SAMPLE_SMART_AMP
85+
#if defined(CONFIG_SAMPLE_SMART_AMP) || defined(LLEXT_FORCE_ALL_MODULAR)
8686
#include <samples/audio/smart_amp_test.toml>
8787
#endif
8888

89-
#ifdef CONFIG_COMP_IIR
89+
#if defined(CONFIG_COMP_IIR) || defined(LLEXT_FORCE_ALL_MODULAR)
9090
#include <audio/eq_iir/eq_iir.toml>
9191
#endif
9292

93-
#ifdef CONFIG_COMP_FIR
93+
#if defined(CONFIG_COMP_FIR) || defined(LLEXT_FORCE_ALL_MODULAR)
9494
#include <audio/eq_fir/eq_fir.toml>
9595
#endif
9696

97-
#ifdef CONFIG_COMP_ARIA
97+
#if defined(CONFIG_COMP_ARIA) || defined(LLEXT_FORCE_ALL_MODULAR)
9898
#include <audio/aria/aria.toml>
9999
#endif
100100

101-
#ifdef CONFIG_COMP_DRC
101+
#if defined(CONFIG_COMP_DRC) || defined(LLEXT_FORCE_ALL_MODULAR)
102102
#include <audio/drc/drc.toml>
103103
#endif
104104

105-
#ifdef CONFIG_COMP_CROSSOVER
105+
#if defined(CONFIG_COMP_CROSSOVER) || defined(LLEXT_FORCE_ALL_MODULAR)
106106
#include <audio/crossover/crossover.toml>
107107
#endif
108108

109-
#ifdef CONFIG_COMP_MULTIBAND_DRC
109+
#if defined(CONFIG_COMP_MULTIBAND_DRC) || defined(LLEXT_FORCE_ALL_MODULAR)
110110
#include <audio/multiband_drc/multiband_drc.toml>
111111
#endif
112112

113-
#ifdef CONFIG_COMP_DCBLOCK
113+
#if defined(CONFIG_COMP_DCBLOCK) || defined(LLEXT_FORCE_ALL_MODULAR)
114114
#include <audio/dcblock/dcblock.toml>
115115
#endif
116116

117-
#ifdef CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING
117+
#if defined(CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING) || defined(LLEXT_FORCE_ALL_MODULAR)
118118
#include <audio/google/google_rtc_audio_processing.toml>
119119
#endif
120120

121-
#ifdef CONFIG_COMP_TDFB
121+
#if defined(CONFIG_COMP_TDFB) || defined(LLEXT_FORCE_ALL_MODULAR)
122122
#include <audio/tdfb/tdfb.toml>
123123
#endif
124124

125-
#ifdef CONFIG_COMP_RTNR
125+
#if defined(CONFIG_COMP_RTNR) || defined(LLEXT_FORCE_ALL_MODULAR)
126126
#include <audio/rtnr/rtnr.toml>
127127
#endif
128128

129-
#ifdef CONFIG_COMP_IGO_NR
129+
#if defined(CONFIG_COMP_IGO_NR) || defined(LLEXT_FORCE_ALL_MODULAR)
130130
#include <audio/igo_nr/igo_nr.toml>
131131
#endif
132132

133-
#ifdef CONFIG_COMP_MFCC
133+
#if defined(CONFIG_COMP_MFCC) || defined(LLEXT_FORCE_ALL_MODULAR)
134134
#include <audio/mfcc/mfcc.toml>
135135
#endif
136136

0 commit comments

Comments
 (0)