build: audio: put modules in alphabetical order

Put the Cmake and Kconfig modules in alphabetical order to help
convenience scripting insert new modules.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>

Author: lrgirdwo

src/audio/CMakeLists.txt

@@ -17,20 +17,18 @@ if(NOT CONFIG_COMP_MODULE_SHARED_LIBRARY_BUILD)
 	add_subdirectory(pcm_converter)
 	add_subdirectory(pipeline)
 
+	if(CONFIG_COMP_BASEFW_IPC4 AND NOT CONFIG_LIBRARY)
+		add_local_sources(sof base_fw.c)
+	endif()
+	add_local_sources_ifdef(CONFIG_IPC4_BASE_FW_INTEL sof base_fw_intel.c)
+
 	# directories and files included conditionally (alphabetical order)
 	if(CONFIG_COMP_ARIA)
 		add_subdirectory(aria)
 	endif()
 	if(CONFIG_COMP_ASRC)
 		add_subdirectory(asrc)
 	endif()
-	if(CONFIG_COMP_BASEFW_IPC4 AND NOT CONFIG_LIBRARY)
-		add_local_sources(sof base_fw.c)
-	endif()
-	add_local_sources_ifdef(CONFIG_IPC4_BASE_FW_INTEL sof base_fw_intel.c)
-	if(CONFIG_COMP_CHAIN_DMA)
-		add_local_sources(sof chain_dma.c)
-	endif()
 	if(CONFIG_COMP_COPIER)
 		add_subdirectory(copier)
 	endif()
@@ -52,19 +50,14 @@ if(NOT CONFIG_COMP_MODULE_SHARED_LIBRARY_BUILD)
 	if(CONFIG_COMP_IIR)
 		add_subdirectory(eq_iir)
 	endif()
-	if(CONFIG_COMP_KPB AND NOT CONFIG_LIBRARY_STATIC)
-		add_local_sources(sof
-			kpb.c
-		)
-	endif()
 	if(CONFIG_COMP_MFCC)
 		add_subdirectory(mfcc)
 	endif()
 	if(CONFIG_COMP_MIXER)
-                add_subdirectory(mixer)
+		add_subdirectory(mixer)
 	endif()
 	if(CONFIG_COMP_MIXIN_MIXOUT)
-                add_subdirectory(mixin_mixout)
+		add_subdirectory(mixin_mixout)
 	endif()
 	if(CONFIG_COMP_MODULE_ADAPTER)
 		add_subdirectory(module_adapter)
@@ -90,39 +83,49 @@ if(NOT CONFIG_COMP_MODULE_SHARED_LIBRARY_BUILD)
 	if(CONFIG_COMP_TDFB)
 		add_subdirectory(tdfb)
 	endif()
-	if(CONFIG_COMP_TONE)
-		add_local_sources(sof
-			tone.c
-		)
+	if(CONFIG_COMP_TEMPLATE_COMP)
+		add_subdirectory(template_comp)
+	endif()
+	if(CONFIG_COMP_TENSORFLOW)
+		add_subdirectory(tensorflow)
 	endif()
 	if(CONFIG_COMP_UP_DOWN_MIXER)
 		add_subdirectory(up_down_mixer)
 	endif()
 	if(CONFIG_COMP_VOLUME)
 		add_subdirectory(volume)
 	endif()
-	if(CONFIG_COMP_TENSORFLOW)
-		add_subdirectory(tensorflow)
-	endif()
 	if(CONFIG_DTS_CODEC)
 		add_subdirectory(codec)
 	endif()
+	# end of directories and files included conditionally (alphabetical order)
+
 	add_subdirectory(google)
 	add_subdirectory(nxp)
 
+	if(CONFIG_COMP_CHAIN_DMA)
+		add_local_sources(sof chain_dma.c)
+	endif()
+	if(CONFIG_COMP_KPB AND NOT CONFIG_LIBRARY_STATIC)
+		add_local_sources(sof
+			kpb.c
+		)
+	endif()
 	if(CONFIG_INTEL_ADSP_MIC_PRIVACY)
 		add_subdirectory(mic_privacy_manager)
 	endif()
+	if(CONFIG_COMP_TONE)
+		add_local_sources(sof
+			tone.c
+		)
+	endif()
 	if(CONFIG_ZEPHYR_NATIVE_DRIVERS)
 		list(APPEND base_files host-zephyr.c)
 		sof_list_append_ifdef(CONFIG_COMP_DAI base_files dai-zephyr.c)
 	else()
 		list(APPEND base_files host-legacy.c)
 		sof_list_append_ifdef(CONFIG_COMP_DAI base_files dai-legacy.c)
 	endif()
-	if(CONFIG_COMP_TEMPLATE_COMP)
-		add_subdirectory(template_comp)
-	endif()
 endif()
 
 ### Common files (also used in shared library build)

src/audio/Kconfig

@@ -2,9 +2,6 @@
 
 menu "Audio components"
 
-rsource "volume/Kconfig"
-rsource "aria/Kconfig"
-
 config COMP_BASEFW_IPC4
 	bool "BASEFW component"
 	default y
@@ -20,8 +17,6 @@ config IPC4_BASE_FW_INTEL
 	  This implements a set of additional IPC4 properties that
 	  extend the base spec.
 
-rsource "copier/Kconfig"
-
 config HOST_DMA_RELOAD_DELAY_ENABLE
 	bool "Delay reloading DMA for host interfaces"
 	default y
@@ -79,8 +74,6 @@ config MODULE_MAX_CONNECTIONS
 	  Specifies the maximum number of sink and source connections a module
 	  may have to other modules.
 
-rsource "up_down_mixer/Kconfig"
-
 config COMP_BLOB
 	bool "Large IPC data as compound message blobs"
 	default y
@@ -96,19 +89,13 @@ config MODULE_MAX_BLOB_SIZE
 	  Specify the maximum size of IPC4 module blob data that can be
 	  appended to each message.
 
-rsource "src/Kconfig"
-
 config COMP_STUBS
 	bool "Build all selected third-party (3P) components with stubs"
 	default n
 	help
 	  Select to force all 3P blocks to link against stubs rather than their libraries. This
 	  should only be used in testing environments like fuzzers or CI.
 
-rsource "eq_fir/Kconfig"
-
-rsource "eq_iir/Kconfig"
-
 config COMP_TONE
 	bool "Tone component"
 	default n
@@ -117,12 +104,6 @@ config COMP_TONE
 	  Select for Tone component.
 	  Warning: This component is deprecated and will be removed from SOF v2.8.
 
-rsource "mixer/Kconfig"
-
-rsource "mixin_mixout/Kconfig"
-
-rsource "mux/Kconfig"
-
 config COMP_KPB
 	bool "KPB component"
 	default y
@@ -139,28 +120,6 @@ config KPB_FORCE_COPY_TYPE_NORMAL
 
 endif # COMP_KPB
 
-rsource "google/Kconfig"
-
-rsource "nxp/Kconfig"
-
-rsource "selector/Kconfig"
-
-rsource "crossover/Kconfig"
-
-rsource "drc/Kconfig"
-
-rsource "multiband_drc/Kconfig"
-
-rsource "dcblock/Kconfig"
-
-rsource "smart_amp/Kconfig"
-
-rsource "asrc/Kconfig"
-
-rsource "tdfb/Kconfig"
-
-rsource "tensorflow/Kconfig"
-
 config COMP_MODULE_ADAPTER
 	bool "Module adapter"
 	default y
@@ -172,17 +131,35 @@ config COMP_MODULE_ADAPTER
 	  "src\include\sof\audio\module_adapter\interfaces.h". It is possible to link several
 	  different codecs and use them in parallel.
 
-rsource "module_adapter/Kconfig"
-
+# --- Kconfig Sources (alphabetical order) ---
+rsource "aria/Kconfig"
+rsource "asrc/Kconfig"
+rsource "codec/Kconfig"
+rsource "copier/Kconfig"
+rsource "crossover/Kconfig"
+rsource "dcblock/Kconfig"
+rsource "drc/Kconfig"
+rsource "eq_fir/Kconfig"
+rsource "eq_iir/Kconfig"
+rsource "google/Kconfig"
 rsource "igo_nr/Kconfig"
-
-rsource "rtnr/Kconfig"
-
 rsource "mfcc/Kconfig"
-
-rsource "codec/Kconfig"
-
+rsource "mixer/Kconfig"
+rsource "mixin_mixout/Kconfig"
+rsource "module_adapter/Kconfig"
+rsource "multiband_drc/Kconfig"
+rsource "mux/Kconfig"
+rsource "nxp/Kconfig"
+rsource "rtnr/Kconfig"
+rsource "selector/Kconfig"
+rsource "smart_amp/Kconfig"
+rsource "src/Kconfig"
+rsource "tdfb/Kconfig"
 rsource "template_comp/Kconfig"
+rsource "tensorflow/Kconfig"
+rsource "up_down_mixer/Kconfig"
+rsource "volume/Kconfig"
+# --- End Kconfig Sources (alphabetical order) ---
 
 endmenu # "Audio components"