app: intel_adsp_ace15_mtpm.conf: separate SOF and Zephyr options

Continue the cleanup and separate SOF and Zephyr options in
the board config file. No functional change, just reordering
the options.

Signed-off-by: Kai Vehmanen <[email protected]>

app/boards/intel_adsp_ace15_mtpm.conf

@@ -1,11 +1,11 @@
 CONFIG_METEORLAKE=y
+CONFIG_RIMAGE_SIGNING_SCHEMA="mtl"
 
-# IPC configuration
+# SOF / IPC configuration
 CONFIG_IPC_MAJOR_4=y
 CONFIG_IPC4_BASE_FW_INTEL=y
-CONFIG_MEMORY_WIN_2_SIZE=12288
 
-# audio pipeline and module settings
+# SOF / audio pipeline and module settings
 CONFIG_COMP_ARIA=y
 CONFIG_COMP_CHAIN_DMA=y
 CONFIG_COMP_CROSSOVER=y
@@ -26,29 +26,52 @@ CONFIG_PCM_CONVERTER_FORMAT_S24_C32_AND_S24_C24=y
 CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S16_C32=y
 CONFIG_PIPELINE_2_0=y
 CONFIG_SAMPLE_KEYPHRASE=y
-CONFIG_ZEPHYR_DP_SCHEDULER=y
 
-# audio modules / mocks
+# SOF / audio modules / mocks
 # This mock is part of official sof-bin releases because the CI that
 # tests it can't use extra CONFIGs. See #9410, #8722 and #9386
 CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING=y
 CONFIG_GOOGLE_RTC_AUDIO_PROCESSING_MOCK=y
 
-# power settings
-CONFIG_ADSP_IMR_CONTEXT_SAVE=n
-CONFIG_ADSP_IDLE_CLOCK_GATING=y
+# SOF / infrastructure
+CONFIG_AMS=y
+CONFIG_COUNTER=y
 CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL=y
-CONFIG_PM=y
-CONFIG_PM_DEVICE=y
-CONFIG_PM_DEVICE_RUNTIME=y
-CONFIG_PM_DEVICE_SYSTEM_MANAGED=y
-CONFIG_PM_DEVICE_POWER_DOMAIN=y
-CONFIG_PM_POLICY_CUSTOM=y
-CONFIG_POWER_DOMAIN=y
-CONFIG_POWER_DOMAIN_INTEL_ADSP=y
+CONFIG_L3_HEAP=y
+CONFIG_LL_WATCHDOG=y
+CONFIG_PROBE=y
+CONFIG_PROBE_DMA_MAX=2
+CONFIG_SOF_TELEMETRY=y
+CONFIG_SOF_TELEMETRY_IO_PERFORMANCE_MEASUREMENTS=y
+CONFIG_SOF_TELEMETRY_PERFORMANCE_MEASUREMENTS=y
+CONFIG_ZEPHYR_NATIVE_DRIVERS=y
+CONFIG_ZEPHYR_DP_SCHEDULER=y
+
+# SOF / loadable modules
+CONFIG_INTEL_MODULES=y
+CONFIG_LIBRARY_MANAGER=y
+CONFIG_LIBRARY_AUTH_SUPPORT=y
+CONFIG_LIBRARY_BASE_ADDRESS=0xa0688000
+
+# SOF / logging
+CONFIG_SOF_LOG_LEVEL_INF=y
+CONFIG_TRACE=n
+CONFIG_ZEPHYR_LOG=y
+
+# Zephyr / OS features
+CONFIG_DEBUG_COREDUMP=y
+CONFIG_DEBUG_COREDUMP_BACKEND_INTEL_ADSP_MEM_WINDOW=y
+CONFIG_DEBUG_COREDUMP_MEMORY_DUMP_MIN=y
+CONFIG_HEAP_MEM_POOL_SIZE=8192
+CONFIG_LLEXT=y
+CONFIG_LLEXT_STORAGE_WRITABLE=y
+CONFIG_MODULES=y
 CONFIG_TIMING_FUNCTIONS=y
+CONFIG_WATCHDOG=y
 
-# device drivers
+# Zephyr / device drivers
+CONFIG_CLOCK_CONTROL=y
+CONFIG_CLOCK_CONTROL_ADSP=y
 CONFIG_DAI=y
 CONFIG_DAI_DMIC_HAS_OWNERSHIP=y
 CONFIG_DAI_DMIC_HAS_MULTIPLE_LINE_SYNC=y
@@ -61,49 +84,26 @@ CONFIG_DMA=y
 CONFIG_DMA_DW_LLI_POOL_SIZE=50
 CONFIG_DMA_INTEL_ADSP_GPDMA=y
 CONFIG_INTEL_ADSP_IPC=y
-CONFIG_LL_WATCHDOG=y
-CONFIG_WATCHDOG=y
-CONFIG_ZEPHYR_NATIVE_DRIVERS=y
-
-# loadable modules
-CONFIG_INTEL_MODULES=y
-CONFIG_LIBRARY_MANAGER=y
-CONFIG_LIBRARY_AUTH_SUPPORT=y
-CONFIG_LIBRARY_BASE_ADDRESS=0xa0688000
-CONFIG_LLEXT=y
-CONFIG_LLEXT_STORAGE_WRITABLE=y
-CONFIG_MODULES=y
-
-# Clock configuration
-CONFIG_CLOCK_CONTROL=y
-CONFIG_CLOCK_CONTROL_ADSP=y
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=38400000
-CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000
-
-# SOF infrastructure
-CONFIG_AMS=y
-CONFIG_COUNTER=y
 CONFIG_INTEL_ADSP_TIMER=y
-CONFIG_SOF_TELEMETRY=y
-CONFIG_SOF_TELEMETRY_IO_PERFORMANCE_MEASUREMENTS=y
-CONFIG_SOF_TELEMETRY_PERFORMANCE_MEASUREMENTS=y
-
-# Intel hardware / MMU and TLB
-CONFIG_HEAP_MEM_POOL_SIZE=8192
-CONFIG_L3_HEAP=y
+CONFIG_MEMORY_WIN_2_SIZE=12288
 CONFIG_MM_DRV_INTEL_ADSP_TLB_REMAP_UNUSED_RAM=y
+CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=38400000
+CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000
 
-# Intel hardware / signing
-CONFIG_RIMAGE_SIGNING_SCHEMA="mtl"
+# Zephyr / power settings
+CONFIG_ADSP_IDLE_CLOCK_GATING=y
+CONFIG_ADSP_IMR_CONTEXT_SAVE=n
+CONFIG_PM=y
+CONFIG_PM_DEVICE=y
+CONFIG_PM_DEVICE_RUNTIME=y
+CONFIG_PM_DEVICE_SYSTEM_MANAGED=y
+CONFIG_PM_DEVICE_POWER_DOMAIN=y
+CONFIG_PM_POLICY_CUSTOM=y
+CONFIG_POWER_DOMAIN=y
+CONFIG_POWER_DOMAIN_INTEL_ADSP=y
 
-# Debug
-CONFIG_DEBUG_COREDUMP=y
-CONFIG_DEBUG_COREDUMP_BACKEND_INTEL_ADSP_MEM_WINDOW=y
-CONFIG_DEBUG_COREDUMP_MEMORY_DUMP_MIN=y
-CONFIG_PROBE=y
-CONFIG_PROBE_DMA_MAX=2
+# Zephyr / logging
 
-# Logging
 CONFIG_LOG_BACKEND_ADSP=n
 CONFIG_LOG_BACKEND_ADSP_MTRACE=y
 CONFIG_LOG_BACKEND_SOF_PROBE=n
@@ -113,7 +113,4 @@ CONFIG_LOG_FUNC_NAME_PREFIX_INF=y
 CONFIG_LOG_FUNC_NAME_PREFIX_DBG=y
 CONFIG_LOG_OUTPUT_FORMAT_LINUX_TIMESTAMP=y
 CONFIG_LOG_TIMESTAMP_64BIT=y
-CONFIG_SOF_LOG_LEVEL_INF=y
-CONFIG_TRACE=n
 CONFIG_WINSTREAM_CONSOLE=n
-CONFIG_ZEPHYR_LOG=y