From 0024c45caa49c40218136453deb4432a6d53c9b0 Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Mon, 28 Oct 2024 16:26:17 +0200 Subject: [PATCH 1/6] app: intel_adsp_ace30_ptl.conf: clean up board config file Group the configuration options per theme, separate SOF and Zephyr Kconfig settings and order the entries in alphabetical order within each group. This makes the board config file much more readable and easy to maintain. No functional change, only reordering the entries. Signed-off-by: Kai Vehmanen --- app/boards/intel_adsp_ace30_ptl.conf | 112 ++++++++++++++------------- 1 file changed, 57 insertions(+), 55 deletions(-) diff --git a/app/boards/intel_adsp_ace30_ptl.conf b/app/boards/intel_adsp_ace30_ptl.conf index abccb1127aba..ac2345e3e22b 100644 --- a/app/boards/intel_adsp_ace30_ptl.conf +++ b/app/boards/intel_adsp_ace30_ptl.conf @@ -1,26 +1,54 @@ CONFIG_PANTHERLAKE=y +CONFIG_RIMAGE_SIGNING_SCHEMA="ptl" + +# SOF / IPC configuration CONFIG_IPC_MAJOR_4=y CONFIG_IPC4_BASE_FW_INTEL=y +# SOF / audio pipeline and module settings CONFIG_COMP_SRC=y CONFIG_MM_DRV=y -CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y +CONFIG_COMP_ARIA=y +CONFIG_COMP_CHAIN_DMA=y CONFIG_COMP_DRC=y +CONFIG_COMP_KPB=y +CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y +CONFIG_COMP_UP_DOWN_MIXER=y +CONFIG_COMP_VOLUME_WINDOWS_FADE=y +CONFIG_FORMAT_CONVERT_HIFI3=n +CONFIG_FORMAT_U8=y +CONFIG_PCM_CONVERTER_FORMAT_S16_C16_AND_S16_C32=y +CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S32_C32=y +CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S24_C32=y +CONFIG_PCM_CONVERTER_FORMAT_S24_C24_AND_S24_C32=y +CONFIG_PCM_CONVERTER_FORMAT_S24_C32_AND_S24_C24=y +CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S16_C32=y +CONFIG_PCM_CONVERTER_FORMAT_U8=y +CONFIG_PIPELINE_2_0=y -# power settings -CONFIG_PM=y -CONFIG_PM_DEVICE=y -CONFIG_PM_DEVICE_RUNTIME=y -CONFIG_PM_DEVICE_POWER_DOMAIN=y -CONFIG_PM_DEVICE_SYSTEM_MANAGED=y -CONFIG_PM_POLICY_CUSTOM=y -CONFIG_ADSP_IMR_CONTEXT_SAVE=y +# SOF / infrastructure +CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL=y +CONFIG_PROBE=y +CONFIG_PROBE_DMA_MAX=2 +CONFIG_ZEPHYR_DP_SCHEDULER=y +CONFIG_ZEPHYR_NATIVE_DRIVERS=y -CONFIG_POWER_DOMAIN=y -CONFIG_POWER_DOMAIN_INTEL_ADSP=y +# SOF / loadable modules +CONFIG_INTEL_MODULES=y +CONFIG_LIBRARY_MANAGER=y -# enable Zephyr drivers -CONFIG_ZEPHYR_NATIVE_DRIVERS=y +# SOF / logging +CONFIG_TRACE=n +CONFIG_SOF_LOG_LEVEL_INF=y +CONFIG_ZEPHYR_LOG=y + +# Zephyr / OS features +CONFIG_HEAP_MEM_POOL_SIZE=8192 +CONFIG_L3_HEAP=y + +# Zephyr / device drivers +CONFIG_CLOCK_CONTROL=y +CONFIG_CLOCK_CONTROL_ADSP=y CONFIG_DAI=y CONFIG_DAI_INIT_PRIORITY=70 CONFIG_DAI_INTEL_DMIC=y @@ -29,56 +57,30 @@ CONFIG_DAI_INTEL_DMIC_NHLT=y CONFIG_DAI_DMIC_HAS_OWNERSHIP=n CONFIG_DAI_DMIC_HAS_MULTIPLE_LINE_SYNC=y CONFIG_DAI_INTEL_SSP=y -CONFIG_PIPELINE_2_0=y -CONFIG_ZEPHYR_DP_SCHEDULER=y CONFIG_DMA=y CONFIG_DMA_INTEL_ADSP_GPDMA=n CONFIG_DMA_DW_LLI_POOL_SIZE=50 -CONFIG_INTEL_MODULES=y -CONFIG_LIBRARY_MANAGER=y +CONFIG_INTEL_ADSP_IPC=y CONFIG_INTEL_ADSP_TIMER=y +CONFIG_MM_DRV_INTEL_ADSP_TLB_REMAP_UNUSED_RAM=y +CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000 -CONFIG_HEAP_MEM_POOL_SIZE=8192 -CONFIG_L3_HEAP=y -CONFIG_RIMAGE_SIGNING_SCHEMA="ptl" +# Zephyr / power settings +CONFIG_ADSP_IMR_CONTEXT_SAVE=y +CONFIG_PM=y +CONFIG_PM_DEVICE=y +CONFIG_PM_DEVICE_RUNTIME=y +CONFIG_PM_DEVICE_POWER_DOMAIN=y +CONFIG_PM_DEVICE_SYSTEM_MANAGED=y +CONFIG_PM_POLICY_CUSTOM=y +CONFIG_POWER_DOMAIN=y +CONFIG_POWER_DOMAIN_INTEL_ADSP=y -CONFIG_FORMAT_CONVERT_HIFI3=n -CONFIG_FORMAT_U8=y -CONFIG_PCM_CONVERTER_FORMAT_U8=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C16_AND_S16_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S32_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S24_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S24_C24_AND_S24_C32=y -CONFIG_PCM_CONVERTER_FORMAT_S24_C32_AND_S24_C24=y -CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S16_C32=y +# Zephyr / logging CONFIG_LOG=y -CONFIG_LOG_MODE_DEFERRED=y +CONFIG_LOG_BACKEND_ADSP_MTRACE=y CONFIG_LOG_FUNC_NAME_PREFIX_ERR=y CONFIG_LOG_FUNC_NAME_PREFIX_WRN=y CONFIG_LOG_FUNC_NAME_PREFIX_INF=y CONFIG_LOG_FUNC_NAME_PREFIX_DBG=y -CONFIG_COMP_VOLUME_WINDOWS_FADE=y -CONFIG_COMP_UP_DOWN_MIXER=y -CONFIG_COMP_CHAIN_DMA=y -CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000 - -CONFIG_MM_DRV_INTEL_ADSP_TLB_REMAP_UNUSED_RAM=y - -CONFIG_LOG_BACKEND_ADSP_MTRACE=y -CONFIG_SOF_LOG_LEVEL_INF=y - -CONFIG_ZEPHYR_LOG=y -CONFIG_INTEL_ADSP_IPC=y - -CONFIG_CLOCK_CONTROL_ADSP=y -CONFIG_CLOCK_CONTROL=y -CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL=y - -CONFIG_COMP_KPB=y -CONFIG_COMP_ARIA=y - -CONFIG_PROBE=y -CONFIG_PROBE_DMA_MAX=2 - -# Temporary disabled options -CONFIG_TRACE=n +CONFIG_LOG_MODE_DEFERRED=y From 1b1d009c84282bb37311260515cae374a52a5657 Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Tue, 29 Oct 2024 15:26:29 +0200 Subject: [PATCH 2/6] app: intel_adsp_cavs25.conf: clean up board config file Group the configuration options per theme, separate SOF and Zephyr Kconfig settings and order the entries in alphabetical order within each group. This makes the board config file much more readable and easy to maintain. No functional change, just reordering the options. Signed-off-by: Kai Vehmanen --- app/boards/intel_adsp_cavs25.conf | 96 ++++++++++++++++--------------- 1 file changed, 49 insertions(+), 47 deletions(-) diff --git a/app/boards/intel_adsp_cavs25.conf b/app/boards/intel_adsp_cavs25.conf index 62de1ddaab8c..4433705d66c8 100644 --- a/app/boards/intel_adsp_cavs25.conf +++ b/app/boards/intel_adsp_cavs25.conf @@ -1,23 +1,20 @@ CONFIG_TIGERLAKE=y -CONFIG_COMP_CHAIN_DMA=y -CONFIG_AMS=y -CONFIG_LP_MEMORY_BANKS=1 -CONFIG_HP_MEMORY_BANKS=30 -CONFIG_MM_DRV=y -CONFIG_INTEL_MODULES=y -CONFIG_LIBRARY_MANAGER=n CONFIG_RIMAGE_SIGNING_SCHEMA="tgl" +CONFIG_RIMAGE_SIGNING_SCHEMA="tgl-cavs" -CONFIG_DEBUG_COREDUMP=y -CONFIG_DEBUG_COREDUMP_BACKEND_INTEL_ADSP_MEM_WINDOW=y -CONFIG_DEBUG_COREDUMP_MEMORY_DUMP_MIN=y - -# DTRACE is IPC3 only, disable it -CONFIG_TRACE=n - +# SOF / IPC configuration CONFIG_IPC_MAJOR_4=y CONFIG_IPC4_BASE_FW_INTEL=y -CONFIG_RIMAGE_SIGNING_SCHEMA="tgl-cavs" + +# SOF / audio pipeline and module settings +CONFIG_COMP_ARIA=y +CONFIG_COMP_CHAIN_DMA=y +CONFIG_COMP_CROSSOVER=y +CONFIG_COMP_DRC=y +CONFIG_COMP_MFCC=y +CONFIG_COMP_MULTIBAND_DRC=y +CONFIG_COMP_VOLUME_WINDOWS_FADE=y +CONFIG_FORMAT_CONVERT_HIFI3=n CONFIG_PCM_CONVERTER_FORMAT_S16LE=y CONFIG_PCM_CONVERTER_FORMAT_S24LE=y CONFIG_PCM_CONVERTER_FORMAT_S32LE=y @@ -27,40 +24,31 @@ CONFIG_PCM_CONVERTER_FORMAT_S16_C16_AND_S16_C32=y CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S32_C32=y CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S24_C32=y CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S16_C32=y -CONFIG_COMP_VOLUME_WINDOWS_FADE=y -CONFIG_COMP_DRC=y -CONFIG_COMP_CROSSOVER=y -CONFIG_COMP_MULTIBAND_DRC=y -CONFIG_COMP_ARIA=y -CONFIG_COMP_MFCC=y -# route SOF logs to Zephyr logging subsystem -CONFIG_SOF_LOG_LEVEL_INF=y -CONFIG_ZEPHYR_LOG=y - -# use mtrace for IPC4 and disable etrace/ADSP backend -CONFIG_LOG_BACKEND_ADSP_MTRACE=y -CONFIG_LOG_BACKEND_ADSP=n -CONFIG_LOG_OUTPUT_FORMAT_LINUX_TIMESTAMP=y -CONFIG_WINSTREAM_CONSOLE=n +# SOF / infrastructure +CONFIG_AMS=y +CONFIG_LP_MEMORY_BANKS=1 +CONFIG_HP_MEMORY_BANKS=30 +CONFIG_ZEPHYR_NATIVE_DRIVERS=y -CONFIG_LOG_FUNC_NAME_PREFIX_ERR=y -CONFIG_LOG_FUNC_NAME_PREFIX_WRN=y -CONFIG_LOG_FUNC_NAME_PREFIX_INF=y -CONFIG_LOG_FUNC_NAME_PREFIX_DBG=y +# SOF / loadable modules +CONFIG_INTEL_MODULES=y +CONFIG_LIBRARY_MANAGER=n -CONFIG_INTEL_ADSP_TIMER=y -CONFIG_FORMAT_CONVERT_HIFI3=n +# SOF / logging +CONFIG_TRACE=n +CONFIG_SOF_LOG_LEVEL_INF=y +CONFIG_ZEPHYR_LOG=y -CONFIG_PM=y -CONFIG_PM_DEVICE=y -CONFIG_PM_DEVICE_RUNTIME=y -CONFIG_PM_POLICY_CUSTOM=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_CLOCK_CONTROL_ADSP=y +# Zephyr / device drivers CONFIG_CLOCK_CONTROL=y - -CONFIG_ZEPHYR_NATIVE_DRIVERS=y +CONFIG_CLOCK_CONTROL_ADSP=y CONFIG_DAI=y CONFIG_DAI_INIT_PRIORITY=70 CONFIG_DAI_INTEL_SSP=y @@ -69,14 +57,28 @@ CONFIG_DAI_INTEL_ALH=y CONFIG_DAI_INTEL_DMIC_NHLT=y CONFIG_DAI_INTEL_HDA=y CONFIG_DAI_DMIC_HW_IOCLK=38400000 - -CONFIG_INTEL_ADSP_IPC=y - CONFIG_DMA=y CONFIG_DMA_DW_LLI_POOL_SIZE=100 CONFIG_DMA_DW_HW_LLI=y CONFIG_DMA_DW_FIFO_PARTITION=y CONFIG_DMA_INTEL_ADSP_GPDMA_HAS_LLP=y +CONFIG_INTEL_ADSP_IPC=y +CONFIG_INTEL_ADSP_TIMER=y +CONFIG_MM_DRV=y -CONFIG_HEAP_MEM_POOL_SIZE=8192 +# Zephyr / power settings +CONFIG_PM=y +CONFIG_PM_DEVICE=y +CONFIG_PM_DEVICE_RUNTIME=y +CONFIG_PM_POLICY_CUSTOM=y + +# Zephyr / logging +CONFIG_LOG_BACKEND_ADSP=n +CONFIG_LOG_BACKEND_ADSP_MTRACE=y +CONFIG_LOG_FUNC_NAME_PREFIX_ERR=y +CONFIG_LOG_FUNC_NAME_PREFIX_WRN=y +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_WINSTREAM_CONSOLE=n From 2b442f17e4e1fc31d22040d9a82fe1b9761e855a Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Tue, 29 Oct 2024 15:43:00 +0200 Subject: [PATCH 3/6] app: intel_adsp_cavs25_tgph.conf: clean up board config file Group the configuration options per theme, separate SOF and Zephyr Kconfig settings and order the entries in alphabetical order within each group. This makes the board config file much more readable and Signed-off-by: Kai Vehmanen --- app/boards/intel_adsp_cavs25_tgph.conf | 94 +++++++++++++------------- 1 file changed, 48 insertions(+), 46 deletions(-) diff --git a/app/boards/intel_adsp_cavs25_tgph.conf b/app/boards/intel_adsp_cavs25_tgph.conf index 8a130e8a1d1a..0fd502938ba6 100644 --- a/app/boards/intel_adsp_cavs25_tgph.conf +++ b/app/boards/intel_adsp_cavs25_tgph.conf @@ -1,22 +1,20 @@ CONFIG_TIGERLAKE=y -CONFIG_COMP_CHAIN_DMA=y -CONFIG_LP_MEMORY_BANKS=1 -CONFIG_HP_MEMORY_BANKS=30 -CONFIG_MM_DRV=y -CONFIG_INTEL_MODULES=y -CONFIG_LIBRARY_MANAGER=n CONFIG_RIMAGE_SIGNING_SCHEMA="tgl-h" +CONFIG_RIMAGE_SIGNING_SCHEMA="tgl-cavs" -CONFIG_DEBUG_COREDUMP=y -CONFIG_DEBUG_COREDUMP_BACKEND_INTEL_ADSP_MEM_WINDOW=y -CONFIG_DEBUG_COREDUMP_MEMORY_DUMP_MIN=y - -# DTRACE is IPC3 only, disable it -CONFIG_TRACE=n - +# SOF / IPC configuration CONFIG_IPC_MAJOR_4=y CONFIG_IPC4_BASE_FW_INTEL=y -CONFIG_RIMAGE_SIGNING_SCHEMA="tgl-cavs" + +# SOF / audio pipeline and module settings +CONFIG_COMP_ARIA=y +CONFIG_COMP_CHAIN_DMA=y +CONFIG_COMP_CROSSOVER=y +CONFIG_COMP_DRC=y +CONFIG_COMP_MFCC=y +CONFIG_COMP_MULTIBAND_DRC=y +CONFIG_COMP_VOLUME_WINDOWS_FADE=y +CONFIG_FORMAT_CONVERT_HIFI3=n CONFIG_PCM_CONVERTER_FORMAT_S16LE=y CONFIG_PCM_CONVERTER_FORMAT_S24LE=y CONFIG_PCM_CONVERTER_FORMAT_S32LE=y @@ -26,40 +24,30 @@ CONFIG_PCM_CONVERTER_FORMAT_S16_C16_AND_S16_C32=y CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S32_C32=y CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S24_C32=y CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S16_C32=y -CONFIG_COMP_VOLUME_WINDOWS_FADE=y -CONFIG_COMP_DRC=y -CONFIG_COMP_CROSSOVER=y -CONFIG_COMP_MULTIBAND_DRC=y -CONFIG_COMP_ARIA=y -CONFIG_COMP_MFCC=y - -# route SOF logs to Zephyr logging subsystem -CONFIG_SOF_LOG_LEVEL_INF=y -CONFIG_ZEPHYR_LOG=y -# use mtrace for IPC4 and disable etrace/ADSP backend -CONFIG_LOG_BACKEND_ADSP_MTRACE=y -CONFIG_LOG_BACKEND_ADSP=n -CONFIG_LOG_OUTPUT_FORMAT_LINUX_TIMESTAMP=y -CONFIG_WINSTREAM_CONSOLE=n +# SOF / infrastructure +CONFIG_LP_MEMORY_BANKS=1 +CONFIG_HP_MEMORY_BANKS=30 +CONFIG_ZEPHYR_NATIVE_DRIVERS=y -CONFIG_LOG_FUNC_NAME_PREFIX_ERR=y -CONFIG_LOG_FUNC_NAME_PREFIX_WRN=y -CONFIG_LOG_FUNC_NAME_PREFIX_INF=y -CONFIG_LOG_FUNC_NAME_PREFIX_DBG=y +# SOF / loadable modules +CONFIG_INTEL_MODULES=y +CONFIG_LIBRARY_MANAGER=n -CONFIG_INTEL_ADSP_TIMER=y -CONFIG_FORMAT_CONVERT_HIFI3=n +# SOF / logging +CONFIG_TRACE=n +CONFIG_SOF_LOG_LEVEL_INF=y +CONFIG_ZEPHYR_LOG=y -CONFIG_PM=y -CONFIG_PM_DEVICE=y -CONFIG_PM_DEVICE_RUNTIME=y -CONFIG_PM_POLICY_CUSTOM=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_CLOCK_CONTROL_ADSP=y +# Zephyr / device drivers CONFIG_CLOCK_CONTROL=y - -CONFIG_ZEPHYR_NATIVE_DRIVERS=y +CONFIG_CLOCK_CONTROL_ADSP=y CONFIG_DAI=y CONFIG_DAI_INIT_PRIORITY=70 CONFIG_DAI_INTEL_SSP=y @@ -68,14 +56,28 @@ CONFIG_DAI_INTEL_ALH=y CONFIG_DAI_INTEL_DMIC_NHLT=y CONFIG_DAI_INTEL_HDA=y CONFIG_DAI_DMIC_HW_IOCLK=38400000 - -CONFIG_INTEL_ADSP_IPC=y - CONFIG_DMA=y CONFIG_DMA_DW_LLI_POOL_SIZE=100 CONFIG_DMA_DW_HW_LLI=y CONFIG_DMA_DW_FIFO_PARTITION=y CONFIG_DMA_INTEL_ADSP_GPDMA_HAS_LLP=y +CONFIG_INTEL_ADSP_IPC=y +CONFIG_INTEL_ADSP_TIMER=y +CONFIG_MM_DRV=y -CONFIG_HEAP_MEM_POOL_SIZE=8192 +# Zephyr / power settings +CONFIG_PM=y +CONFIG_PM_DEVICE=y +CONFIG_PM_DEVICE_RUNTIME=y +CONFIG_PM_POLICY_CUSTOM=y + +# Zephyr / logging +CONFIG_LOG_BACKEND_ADSP=n +CONFIG_LOG_BACKEND_ADSP_MTRACE=y +CONFIG_LOG_FUNC_NAME_PREFIX_ERR=y +CONFIG_LOG_FUNC_NAME_PREFIX_WRN=y +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_WINSTREAM_CONSOLE=n From 6f984bc41164d666b26d2c1babc0253fa54079bd Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Tue, 29 Oct 2024 15:38:02 +0200 Subject: [PATCH 4/6] app: intel_adsp_cavs25*.conf: remove obsolete rimage items Remove old, duplicated options for rimage signing schema from cavs25 and cavs25_tgph config files. No functional change to build as the newer options have taken precedence already before this change. Signed-off-by: Kai Vehmanen --- app/boards/intel_adsp_cavs25.conf | 1 - app/boards/intel_adsp_cavs25_tgph.conf | 1 - 2 files changed, 2 deletions(-) diff --git a/app/boards/intel_adsp_cavs25.conf b/app/boards/intel_adsp_cavs25.conf index 4433705d66c8..1117c66437e4 100644 --- a/app/boards/intel_adsp_cavs25.conf +++ b/app/boards/intel_adsp_cavs25.conf @@ -1,5 +1,4 @@ CONFIG_TIGERLAKE=y -CONFIG_RIMAGE_SIGNING_SCHEMA="tgl" CONFIG_RIMAGE_SIGNING_SCHEMA="tgl-cavs" # SOF / IPC configuration diff --git a/app/boards/intel_adsp_cavs25_tgph.conf b/app/boards/intel_adsp_cavs25_tgph.conf index 0fd502938ba6..83dea362fb06 100644 --- a/app/boards/intel_adsp_cavs25_tgph.conf +++ b/app/boards/intel_adsp_cavs25_tgph.conf @@ -1,5 +1,4 @@ CONFIG_TIGERLAKE=y -CONFIG_RIMAGE_SIGNING_SCHEMA="tgl-h" CONFIG_RIMAGE_SIGNING_SCHEMA="tgl-cavs" # SOF / IPC configuration From 186d8c8adc39d4aa6c2a078fd09747bf3fba01d2 Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Tue, 29 Oct 2024 15:13:09 +0200 Subject: [PATCH 5/6] 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 --- app/boards/intel_adsp_ace15_mtpm.conf | 113 +++++++++++++------------- 1 file changed, 55 insertions(+), 58 deletions(-) diff --git a/app/boards/intel_adsp_ace15_mtpm.conf b/app/boards/intel_adsp_ace15_mtpm.conf index fc3ca89923b8..3908ca5d30d3 100644 --- a/app/boards/intel_adsp_ace15_mtpm.conf +++ b/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 From e4b3015581672539608d648c9016a96fd8a0e233 Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Mon, 28 Oct 2024 13:50:35 +0200 Subject: [PATCH 6/6] app: intel_adsp_ace20_lnl.conf: move CONFIG_ZEPHYR_LOG Move CONFIG_ZEPHYR_LOG to correct section under SOF logging configuration as this option is not Zephyr but a SOF-side option, despite what its name hints at. Signed-off-by: Kai Vehmanen --- app/boards/intel_adsp_ace20_lnl.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/boards/intel_adsp_ace20_lnl.conf b/app/boards/intel_adsp_ace20_lnl.conf index 7d6271905d9b..de34c1f3ace9 100644 --- a/app/boards/intel_adsp_ace20_lnl.conf +++ b/app/boards/intel_adsp_ace20_lnl.conf @@ -44,6 +44,7 @@ CONFIG_LIBRARY_MANAGER=y # SOF / logging CONFIG_SOF_LOG_LEVEL_INF=y CONFIG_TRACE=n +CONFIG_ZEPHYR_LOG=y # Zephyr / OS features CONFIG_COUNTER=y @@ -95,4 +96,3 @@ CONFIG_LOG_FUNC_NAME_PREFIX_DBG=y CONFIG_LOG_OUTPUT_FORMAT_LINUX_TIMESTAMP=y CONFIG_LOG_TIMESTAMP_64BIT=y CONFIG_WINSTREAM_CONSOLE=n -CONFIG_ZEPHYR_LOG=y