smart-amp-test: remove obsolete build options

smart-amp-test was one of the first modules, used as an example for loadable module development. Currently it can be built in 4 ways: - monolithic - as an LMDK native module - as legacy LLEXT - as current LLEXT This commit removes legacy options and only preserves the first and the last options. Signed-off-by: Guennadi Liakhovetski <[email protected]>
lyakh · Jan 13, 2025 · 64bb4fb · 64bb4fb
1 parent 7d11802
commit 64bb4fb
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 238 deletions.
diff --git a/lmdk/cmake/ldscripts/data_linker_script.txt b/lmdk/cmake/ldscripts/data_linker_script.txt
@@ -15,7 +15,7 @@ SECTIONS {
         _data_end = ABSOLUTE(.);
     } >HPSRAM_seg : data_phdr
 
-    .rodata : ALIGN(4096) {
+    .rodata : {
         _rodata_start = ABSOLUTE(.);
         *(.gnu.linkonce.r.*)
         *(.rodata)

diff --git a/lmdk/libraries/smart_amp_test/CMakeLists.txt b/lmdk/libraries/smart_amp_test/CMakeLists.txt
diff --git a/lmdk/libraries/smart_amp_test/smart_amp_test.toml b/lmdk/libraries/smart_amp_test/smart_amp_test.toml
diff --git a/lmdk/modules/smart_amp_test/CMakeLists.txt b/lmdk/modules/smart_amp_test/CMakeLists.txt
diff --git a/src/include/ipc4/base-config.h b/src/include/ipc4/base-config.h
@@ -23,9 +23,8 @@
 
 #ifndef __SOF_IPC4_BASE_CONFIG_H__
 #define __SOF_IPC4_BASE_CONFIG_H__
-#ifndef __SOF_MODULE_SERVICE_BUILD__
+
 #include <sof/compiler_attributes.h>
-#endif
 #include <module/ipc4/base-config.h>
 
 struct sof_ipc_stream_params;

diff --git a/src/include/sof/samples/audio/smart_amp_test.h b/src/include/sof/samples/audio/smart_amp_test.h
@@ -8,10 +8,8 @@
 #ifndef __SOF_AUDIO_SMART_AMP_H__
 #define __SOF_AUDIO_SMART_AMP_H__
 
-#ifndef __SOF_MODULE_SERVICE_BUILD__
 #include <sof/audio/component.h>
 #include <sof/audio/data_blob.h>
-#endif
 
 #if CONFIG_IPC_MAJOR_4
 #include <ipc4/base-config.h>
@@ -21,20 +19,10 @@
 
 #define SMART_AMP_MAX_STREAM_CHAN   8
 
-/* Max channels for all intel platforms are 8 */
-#define MAX_CHANNELS	8
-
 /** IPC blob types */
 #define SOF_SMART_AMP_CONFIG	0
 #define SOF_SMART_AMP_MODEL	1
 
-#ifdef __SOF_MODULE_SERVICE_BUILD__
-#define LOG_ERR(...)
-#define LOG_WRN(...)
-#define LOG_DBG(...)
-#define LOG_INF(...)
-#endif
-
 struct smart_amp_model_data {
 	uint32_t data_size;
 	void *data;
@@ -95,8 +83,8 @@ struct smart_amp_model_data {
 struct sof_smart_amp_config {
 	uint32_t size;
 	uint32_t feedback_channels;
-	int8_t source_ch_map[MAX_CHANNELS];
-	int8_t feedback_ch_map[MAX_CHANNELS];
+	int8_t source_ch_map[PLATFORM_MAX_CHANNELS];
+	int8_t feedback_ch_map[PLATFORM_MAX_CHANNELS];
 };
 
 #if CONFIG_IPC_MAJOR_4