library-manager: disable INTEL_MODULES by default

IADK is rarely needed, but when enabled it adds C++ objects to the
build, while otherwise build are pure C. Disable INTEL_MODULES by
default on ACE platforms.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>

Author: lyakh

app/boards/intel_adsp_ace15_mtpm.conf

@@ -52,7 +52,6 @@ CONFIG_ZEPHYR_TWB_SCHEDULER=y
 CONFIG_COLD_STORE_EXECUTE_DRAM=y
 
 # SOF / loadable modules
-CONFIG_INTEL_MODULES=y
 CONFIG_LIBRARY_MANAGER=y
 CONFIG_LIBRARY_AUTH_SUPPORT=y
 CONFIG_LIBRARY_BASE_ADDRESS=0xa0688000

app/boards/intel_adsp_ace20_lnl.conf

@@ -38,7 +38,6 @@ CONFIG_ZEPHYR_DP_SCHEDULER=y
 CONFIG_ZEPHYR_NATIVE_DRIVERS=y
 
 # SOF / loadable modules
-CONFIG_INTEL_MODULES=y
 CONFIG_LIBRARY_AUTH_SUPPORT=y
 CONFIG_LIBRARY_BASE_ADDRESS=0xa0688000
 CONFIG_LIBRARY_MANAGER=y

app/boards/intel_adsp_ace30_ptl.conf

@@ -37,7 +37,6 @@ CONFIG_ZEPHYR_DP_SCHEDULER=y
 CONFIG_ZEPHYR_NATIVE_DRIVERS=y
 
 # SOF / loadable modules
-CONFIG_INTEL_MODULES=y
 CONFIG_LIBRARY_MANAGER=y
 CONFIG_LIBRARY_BASE_ADDRESS=0xa0688000
 CONFIG_LIBRARY_BUILD_LIB=y

src/include/sof/audio/module_adapter/library/native_system_service.h

@@ -7,7 +7,6 @@
 #define NATIVE_SYSTEM_SERVICE_H
 
 #include <stdint.h>
-#include <adsp_stddef.h>
 
 #ifdef __cplusplus
 extern "C" {

src/library_manager/lib_manager.c

@@ -485,7 +485,6 @@ const struct sof_man_module *lib_manager_get_module_manifest(const uint32_t modu
 					       SOF_MAN_MODULE_OFFSET(entry_index));
 }
 
-#if CONFIG_INTEL_MODULES
 /*
  * \brief Load module code, allocate its instance and create a module adapter component.
  * \param[in] drv - component driver pointer.
@@ -584,7 +583,9 @@ static void lib_manager_prepare_module_adapter(struct comp_driver *drv, const st
 	drv->ops.dai_ts_start = module_adapter_ts_start_op;
 	drv->ops.dai_ts_stop = module_adapter_ts_stop_op;
 	drv->ops.dai_ts_get = module_adapter_ts_get_op;
+#if CONFIG_INTEL_MODULES
 	drv->adapter_ops = &processing_module_adapter_interface;
+#endif
 }
 
 int lib_manager_register_module(const uint32_t component_id)
@@ -679,14 +680,6 @@ int lib_manager_register_module(const uint32_t component_id)
 	return ret;
 }
 
-#else /* CONFIG_INTEL_MODULES */
-int lib_manager_register_module(const uint32_t component_id)
-{
-	tr_err(&lib_manager_tr, "Dynamic module loading is not supported");
-	return -ENOTSUP;
-}
-#endif /* CONFIG_INTEL_MODULES */
-
 static int lib_manager_dma_buffer_alloc(struct lib_manager_dma_ext *dma_ext,
 					uint32_t size)
 {

zephyr/CMakeLists.txt

@@ -520,9 +520,15 @@ zephyr_library_sources_ifdef(CONFIG_COMP_MODULE_ADAPTER
 	${SOF_AUDIO_PATH}/module_adapter/module/generic.c
 )
 
+zephyr_include_directories_ifdef(CONFIG_LIBRARY_MANAGER
+	${SOF_SRC_PATH}/include/sof/audio/module_adapter/library/
+	${SOF_SRC_PATH}/include/sof/audio/module_adapter/iadk/
+)
+
 zephyr_library_sources_ifdef(CONFIG_LIBRARY_MANAGER
 	${SOF_SRC_PATH}/library_manager/lib_manager.c
 	${SOF_SRC_PATH}/library_manager/lib_notification.c
+	${SOF_AUDIO_PATH}/module_adapter/library/native_system_agent.c
 )
 
 if (CONFIG_MM_DRV AND CONFIG_LLEXT)
@@ -531,17 +537,11 @@ zephyr_library_sources_ifdef(CONFIG_LIBRARY_MANAGER
 )
 endif()
 
-zephyr_include_directories_ifdef(CONFIG_INTEL_MODULES
-	${SOF_SRC_PATH}/include/sof/audio/module_adapter/iadk/
-	${SOF_SRC_PATH}/include/sof/audio/module_adapter/library/
-)
-
 zephyr_library_sources_ifdef(CONFIG_INTEL_MODULES
 	${SOF_AUDIO_PATH}/module_adapter/module/modules.c
 	${SOF_AUDIO_PATH}/module_adapter/iadk/module_initial_settings_concrete.cpp
 	${SOF_AUDIO_PATH}/module_adapter/iadk/iadk_module_adapter.cpp
 	${SOF_AUDIO_PATH}/module_adapter/iadk/system_agent.cpp
-	${SOF_AUDIO_PATH}/module_adapter/library/native_system_agent.c
 	${SOF_AUDIO_PATH}/module_adapter/library/native_system_service.c
 )