Kconfig: make Mixer component a config option

Signed-off-by: Adrian Bonislawski <adrian.bonislawski@linux.intel.com>

src/arch/host/CMakeLists.txt

@@ -14,6 +14,7 @@ set(CONFIG_COMP_SRC 1)
 set(CONFIG_COMP_FIR 1)
 set(CONFIG_COMP_IIR 1)
 set(CONFIG_COMP_TONE 1)
+set(CONFIG_COMP_MIXER 1)
 
 configure_file (
 	"${PROJECT_SOURCE_DIR}/src/arch/host/config.h.in"

src/arch/host/config.h.in

@@ -5,3 +5,4 @@
 #define CONFIG_COMP_FIR @CONFIG_COMP_FIR@
 #define CONFIG_COMP_IIR @CONFIG_COMP_IIR@
 #define CONFIG_COMP_TONE @CONFIG_COMP_TONE@
+#define CONFIG_COMP_MIXER @CONFIG_COMP_MIXER@

src/audio/CMakeLists.txt

@@ -1,6 +1,5 @@
 if(NOT BUILD_HOST)
 	add_local_sources(sof
-		mixer.c
 		mux.c
 		switch.c
 		dai.c
@@ -44,6 +43,11 @@ if(NOT BUILD_HOST)
 			tone.c
 		)
 	endif()
+	if(CONFIG_COMP_MIXER)
+		add_local_sources(sof
+			mixer.c
+		)
+	endif()
 	return()
 endif()
 

src/audio/Kconfig

@@ -30,4 +30,10 @@ config COMP_TONE
 	help
 	  Select for Tone component
 
+config COMP_MIXER
+	bool "Mixer component"
+	default y
+	help
+	  Select for Mixer component
+
 endmenu

src/include/sof/audio/component.h

@@ -497,7 +497,11 @@ void sys_comp_init(void);
 /* default base component initialisations */
 void sys_comp_dai_init(void);
 void sys_comp_host_init(void);
+#ifdef CONFIG_COMP_MIXER
 void sys_comp_mixer_init(void);
+#else
+static inline void sys_comp_mixer_init(void) {}
+#endif
 void sys_comp_mux_init(void);
 void sys_comp_switch_init(void);
 #ifdef CONFIG_COMP_VOLUME

test/cmocka/src/audio/CMakeLists.txt

@@ -1,6 +1,8 @@
 add_subdirectory(buffer)
 add_subdirectory(component)
-add_subdirectory(mixer)
+if(CONFIG_COMP_MIXER)
+	add_subdirectory(mixer)
+endif()
 add_subdirectory(pipeline)
 if(CONFIG_COMP_VOLUME)
 	add_subdirectory(volume)