From bee3cbdc6fc8243bdddebe5395e2c84bcf9eb187 Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Thu, 11 Sep 2025 15:04:56 +0300 Subject: [PATCH 1/9] app: boards: intel_adsp: add documentation on default overrides The defconfig mechanism cannot be used to set all common build options as Zephyr Kconfig does not allow to override defaults that have been already set. E.g. CONFIG_LOG_OUTPUT_FORMAT_LINUX_TIMESTAMP and CONFIG_LOG_FLUSH_SLEEP_US=5000 are common for Intel DSPs, but as these both have defaults set in the Zephyr Kconfig definition, we cannot set a new default via defconfig mechanism. Instead the setting must be set in each board file separately. Signed-off-by: Kai Vehmanen --- app/boards/intel_adsp/Kconfig.defconfig | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/boards/intel_adsp/Kconfig.defconfig b/app/boards/intel_adsp/Kconfig.defconfig index fc0e11eaafed..dcf99ab40fb1 100644 --- a/app/boards/intel_adsp/Kconfig.defconfig +++ b/app/boards/intel_adsp/Kconfig.defconfig @@ -2,6 +2,13 @@ # # SPDX-License-Identifier: BSD-3-Clause +# --- +# NOTICE! defconfig files cannot override settings that already have +# a default set. Thus some settings (especially choice values with +# a default), must be set in the board config files even if the value +# is same for all Intel DSPs. +# --- + # SOF / IPC configuration # ----------------------- From 9a6597312a5990d5ffa40eaf04a661fc3f0bc52b Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Thu, 11 Sep 2025 13:38:10 +0300 Subject: [PATCH 2/9] app: boards: intel_adsp: make logging options common Move common Zephyr logging configuration options to the shared file for Intel DSPs. Not all options can be moved as we cannot assign defaults to settings that already have a default (e.g. CONFIG_LOG_OUTPUT_FORMAT_LINUX_TIMESTAMP). Signed-off-by: Kai Vehmanen --- app/boards/intel_adsp/Kconfig.defconfig | 21 +++++++++++++++++++++ app/boards/intel_adsp_ace15_mtpm.conf | 7 ------- app/boards/intel_adsp_ace20_lnl.conf | 6 ------ app/boards/intel_adsp_ace30_ptl.conf | 8 -------- app/boards/intel_adsp_ace30_wcl.conf | 8 -------- app/boards/intel_adsp_ace40_nvl.conf | 7 ------- app/boards/intel_adsp_ace40_nvls.conf | 7 ------- 7 files changed, 21 insertions(+), 43 deletions(-) diff --git a/app/boards/intel_adsp/Kconfig.defconfig b/app/boards/intel_adsp/Kconfig.defconfig index dcf99ab40fb1..4521f939cd6f 100644 --- a/app/boards/intel_adsp/Kconfig.defconfig +++ b/app/boards/intel_adsp/Kconfig.defconfig @@ -68,3 +68,24 @@ config PCM_CONVERTER_FORMAT_U8 config PIPELINE_2_0 default y + +# Zephyr / logging +# ---------------------------------------- + +config LOG_BACKEND_ADSP_MTRACE + default y + +config LOG_FUNC_NAME_PREFIX_ERR + default y + +config LOG_FUNC_NAME_PREFIX_WRN + default y + +config LOG_FUNC_NAME_PREFIX_INF + default y + +config LOG_FUNC_NAME_PREFIX_DBG + default y + +config LOG_TIMESTAMP_64BIT + default y diff --git a/app/boards/intel_adsp_ace15_mtpm.conf b/app/boards/intel_adsp_ace15_mtpm.conf index b9f9d531b617..912f348de17c 100644 --- a/app/boards/intel_adsp_ace15_mtpm.conf +++ b/app/boards/intel_adsp_ace15_mtpm.conf @@ -101,15 +101,8 @@ CONFIG_POWER_DOMAIN=y CONFIG_POWER_DOMAIN_INTEL_ADSP=y # Zephyr / logging - CONFIG_LOG_BACKEND_ADSP=n -CONFIG_LOG_BACKEND_ADSP_MTRACE=y CONFIG_LOG_BACKEND_SOF_PROBE=n -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 CONFIG_LOG_FLUSH_SLEEP_US=5000 diff --git a/app/boards/intel_adsp_ace20_lnl.conf b/app/boards/intel_adsp_ace20_lnl.conf index 58b978186578..f5c1c7e32ac7 100644 --- a/app/boards/intel_adsp_ace20_lnl.conf +++ b/app/boards/intel_adsp_ace20_lnl.conf @@ -81,12 +81,6 @@ CONFIG_POWER_DOMAIN_INTEL_ADSP=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 CONFIG_LOG_FLUSH_SLEEP_US=5000 diff --git a/app/boards/intel_adsp_ace30_ptl.conf b/app/boards/intel_adsp_ace30_ptl.conf index a90abefa38e5..4331e820e2c1 100644 --- a/app/boards/intel_adsp_ace30_ptl.conf +++ b/app/boards/intel_adsp_ace30_ptl.conf @@ -78,15 +78,7 @@ CONFIG_POWER_DOMAIN=y CONFIG_POWER_DOMAIN_INTEL_ADSP=y # Zephyr / logging -CONFIG_LOG=y CONFIG_LOG_BACKEND_ADSP=n -CONFIG_LOG_BACKEND_ADSP_MTRACE=y CONFIG_LOG_FLUSH_SLEEP_US=5000 -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_MODE_DEFERRED=y CONFIG_LOG_OUTPUT_FORMAT_LINUX_TIMESTAMP=y -CONFIG_LOG_TIMESTAMP_64BIT=y CONFIG_WINSTREAM_CONSOLE=n diff --git a/app/boards/intel_adsp_ace30_wcl.conf b/app/boards/intel_adsp_ace30_wcl.conf index 7bdb42daf70d..47da1f3e79b6 100644 --- a/app/boards/intel_adsp_ace30_wcl.conf +++ b/app/boards/intel_adsp_ace30_wcl.conf @@ -70,15 +70,7 @@ CONFIG_POWER_DOMAIN=y CONFIG_POWER_DOMAIN_INTEL_ADSP=y # Zephyr / logging -CONFIG_LOG=y CONFIG_LOG_BACKEND_ADSP=n -CONFIG_LOG_BACKEND_ADSP_MTRACE=y CONFIG_LOG_FLUSH_SLEEP_US=5000 -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_MODE_DEFERRED=y CONFIG_LOG_OUTPUT_FORMAT_LINUX_TIMESTAMP=y -CONFIG_LOG_TIMESTAMP_64BIT=y CONFIG_WINSTREAM_CONSOLE=n diff --git a/app/boards/intel_adsp_ace40_nvl.conf b/app/boards/intel_adsp_ace40_nvl.conf index 92f5db790dc1..704827f22038 100644 --- a/app/boards/intel_adsp_ace40_nvl.conf +++ b/app/boards/intel_adsp_ace40_nvl.conf @@ -67,12 +67,5 @@ CONFIG_POWER_DOMAIN_INTEL_ADSP=y CONFIG_SRAM_RETENTION_MODE=n # Zephyr / logging -CONFIG_LOG=y 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_MODE_DEFERRED=y CONFIG_WINSTREAM_CONSOLE=n diff --git a/app/boards/intel_adsp_ace40_nvls.conf b/app/boards/intel_adsp_ace40_nvls.conf index 92de6590a133..e9108473e31d 100644 --- a/app/boards/intel_adsp_ace40_nvls.conf +++ b/app/boards/intel_adsp_ace40_nvls.conf @@ -68,12 +68,5 @@ CONFIG_POWER_DOMAIN_INTEL_ADSP=y CONFIG_SRAM_RETENTION_MODE=n # Zephyr / logging -CONFIG_LOG=y 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_MODE_DEFERRED=y CONFIG_WINSTREAM_CONSOLE=n From 21e2b6296bf2c49b13a02f54e56917d5bcd92147 Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Fri, 12 Sep 2025 12:28:53 +0300 Subject: [PATCH 3/9] zephyr: remove unnecessary Kconfig defaults Remove unnecessary 'n' defaults in sof/zephyr Kconfig. This doesn't affect any current build as 'n' is the default if not set otherwise. By removing the unconditional defaults, it becomes possible to set defaults later in board/family specific Kconfig.defconfig files. Signed-off-by: Kai Vehmanen --- zephyr/Kconfig | 6 ------ 1 file changed, 6 deletions(-) diff --git a/zephyr/Kconfig b/zephyr/Kconfig index 0bb95b759c96..5c4e58bb8a62 100644 --- a/zephyr/Kconfig +++ b/zephyr/Kconfig @@ -2,7 +2,6 @@ if SOF config SOF_STAGING bool "Enable SOF staging features and modules" - default n help SOF staging features are not ready for production but are upstream to enable developers to continue development in order @@ -13,7 +12,6 @@ rsource "../Kconfig.sof" config SOF_USERSPACE bool "Enable SOF support for userspace modules" - default n help SOF userspace modules support will enable modules to run in DP processing mode as userspace code and data. This feature is WIP @@ -22,7 +20,6 @@ config SOF_USERSPACE config SOF_ZEPHYR_HEAP_CACHED bool "Cached Zephyr heap for SOF memory non-shared zones" default y if CAVS || ACE - default n help Enable cached heap by mapping cached SOF memory zones to different Zephyr sys_heap objects and enable caching for non-shared zones. @@ -79,7 +76,6 @@ config SOF_ZEPHYR_USERSPACE_MODULE_HEAP_SIZE config ZEPHYR_NATIVE_DRIVERS bool "Use Zephyr native drivers" - default n help Enable Zephyr native api drivers for host and dai audio components host-zephyr @@ -111,7 +107,6 @@ config PIPELINE_2_0 config ZEPHYR_DP_SCHEDULER bool "use Zephyr thread based DP scheduler" default y if ACE - default n depends on IPC_MAJOR_4 depends on ZEPHYR_SOF_MODULE depends on ACE @@ -153,7 +148,6 @@ config SOF_ZEPHYR_NO_SOF_CLOCK config VIRTUAL_HEAP bool "Use virtual memory heap to allocate a buffers" default y if ACE - default n depends on ACE help Enabling this option will use the virtual memory heap allocator to allocate buffers. From b997b96c1c9e986c7fca4d4f3d1011ba1d94ca9b Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Fri, 12 Sep 2025 14:00:08 +0300 Subject: [PATCH 4/9] platform: remove unnecessary Kconfig defaults Remove unnecessary 'n' defaults in sof/src/plaform Kconfig. This doesn't affect any current build as 'n' is the default if not set otherwise. By removing the unconditional defaults, it becomes possible to set defaults later in board/family specific Kconfig.defconfig files. Signed-off-by: Kai Vehmanen --- src/platform/Kconfig | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/platform/Kconfig b/src/platform/Kconfig index c19cf72f97c1..ebbe0540b7d4 100644 --- a/src/platform/Kconfig +++ b/src/platform/Kconfig @@ -359,20 +359,17 @@ config MULTICORE config INTEL bool - default n help This has to be selected for every Intel platform. It enables Intel platforms-specific features. config HOST bool - default n help This has to be selected for building linux test targets. config IMX bool - default n select COMPILER_WORKAROUND_CACHE_ATTR if XTENSA help This has to be selected for every i.MX NXP platform. @@ -380,21 +377,18 @@ config IMX config MEDIATEK bool - default n help This has to be selected for every MediaTek platform. It enables MediaTek platforms-specific features. config AMD bool - default n help This has to be selected for every AMD platform. It enables AMD platforms-specific features. config CAVS bool - default n select INTEL select SOF_ZEPHYR_NO_SOF_CLOCK @@ -406,7 +400,6 @@ config CAVS_VERSION_2_5 config ACE bool - default n select INTEL config ACE_VERSION_1_5 @@ -461,7 +454,6 @@ config LP_SRAM config L1_DRAM bool "L1 DRAM memory support" - default n help Indicates that platform does support L1 DATA RAM. @@ -484,7 +476,6 @@ config L1_DRAM_MEMORY_BANK_SIZE config CAVS_USE_LPRO_IN_WAITI bool "Use low power ring oscillator in WFI" - default n depends on CAVS help Select if we want to use LPRO clock in waiti. @@ -493,7 +484,6 @@ config CAVS_USE_LPRO_IN_WAITI config KCPS_DYNAMIC_CLOCK_CONTROL bool "Use KCPS budget to determine DSP clock" - default n depends on IPC_MAJOR_4 help Select if we want to use compute budget @@ -501,7 +491,6 @@ config KCPS_DYNAMIC_CLOCK_CONTROL config L3_HEAP bool "Use L3 memory heap" - default n depends on ACE help Select this if L3 memory is supported on the platform and @@ -565,7 +554,6 @@ config HAVE_AGENT config AMS bool "Enable Async Messaging Service" - default n depends on IPC_MAJOR_4 help Enables Async Messaging Service. @@ -573,7 +561,6 @@ config AMS config AGENT_PANIC_ON_DELAY bool "Enable system agent time verification panic" - default n depends on HAVE_AGENT help Enables system agent time verification panic. @@ -582,7 +569,6 @@ config AGENT_PANIC_ON_DELAY config XTENSA_EXCLUSIVE bool - default n help This has to be selected for xtensa exclusive instructions. There is a definition for EXCLUSIVE option in xtensa-config.h @@ -591,7 +577,6 @@ config FORCE_DMA_COPY_WHOLE_BLOCK bool default y if MT8195 default y if MT8365 - default n depends on HOST_PTABLE help The host component forces DMA to copy the block size to avoid @@ -618,7 +603,6 @@ if XTENSA config INCOHERENT bool "Enable cached data access via the Coherent API" default y if CAVS || ACE - default n help The architecture is cache incoherent. i.e FW has to manually manage cache coherency amongst objects that are used on multiple cores. @@ -629,7 +613,6 @@ endif config LL_WATCHDOG bool "Enable watchdog support in ll scheduler" - default n depends on ACE help Select if you want to protect ll scheduler with a watchdog timer. From df6ecea7a95e2e5c7037a284a8e42c1bbe8f3dff Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Fri, 12 Sep 2025 12:31:46 +0300 Subject: [PATCH 5/9] app: boards: intel_adsp: use common definitions for SOF infra options Move common SOF instrastucture configuration options to the shared defconfigfile for Intel DSPs. Signed-off-by: Kai Vehmanen --- app/boards/intel_adsp/Kconfig.defconfig | 12 ++++++++++++ app/boards/intel_adsp_ace15_mtpm.conf | 3 --- app/boards/intel_adsp_ace20_lnl.conf | 3 --- app/boards/intel_adsp_ace30_ptl.conf | 3 --- app/boards/intel_adsp_ace30_ptl_sim.conf | 1 - app/boards/intel_adsp_ace30_wcl.conf | 3 --- app/boards/intel_adsp_ace30_wcl_sim.conf | 1 - app/boards/intel_adsp_ace40_nvl.conf | 3 --- app/boards/intel_adsp_ace40_nvls.conf | 3 --- app/boards/intel_adsp_cavs25.conf | 1 - app/boards/intel_adsp_cavs25_tgph.conf | 1 - 11 files changed, 12 insertions(+), 22 deletions(-) diff --git a/app/boards/intel_adsp/Kconfig.defconfig b/app/boards/intel_adsp/Kconfig.defconfig index 4521f939cd6f..b8ce5f3be0f2 100644 --- a/app/boards/intel_adsp/Kconfig.defconfig +++ b/app/boards/intel_adsp/Kconfig.defconfig @@ -69,6 +69,18 @@ config PCM_CONVERTER_FORMAT_U8 config PIPELINE_2_0 default y +# SOF / infrastructure +# ---------------------------------------- + +config L3_HEAP + default y if ACE + +config ZEPHYR_DP_SCHEDULER + default y + +config ZEPHYR_NATIVE_DRIVERS + default y + # Zephyr / logging # ---------------------------------------- diff --git a/app/boards/intel_adsp_ace15_mtpm.conf b/app/boards/intel_adsp_ace15_mtpm.conf index 912f348de17c..97528793dd5d 100644 --- a/app/boards/intel_adsp_ace15_mtpm.conf +++ b/app/boards/intel_adsp_ace15_mtpm.conf @@ -29,15 +29,12 @@ CONFIG_GOOGLE_RTC_AUDIO_PROCESSING_MOCK=y CONFIG_AMS=y CONFIG_COUNTER=y CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL=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 CONFIG_ZEPHYR_TWB_SCHEDULER=y CONFIG_COLD_STORE_EXECUTE_DRAM=y diff --git a/app/boards/intel_adsp_ace20_lnl.conf b/app/boards/intel_adsp_ace20_lnl.conf index f5c1c7e32ac7..c1d16fa37deb 100644 --- a/app/boards/intel_adsp_ace20_lnl.conf +++ b/app/boards/intel_adsp_ace20_lnl.conf @@ -18,14 +18,11 @@ CONFIG_SAMPLE_KEYPHRASE=y # SOF / infrastructure CONFIG_AMS=y CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL=n -CONFIG_L3_HEAP=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_DP_SCHEDULER=y -CONFIG_ZEPHYR_NATIVE_DRIVERS=y CONFIG_COLD_STORE_EXECUTE_DRAM=y # SOF / loadable modules diff --git a/app/boards/intel_adsp_ace30_ptl.conf b/app/boards/intel_adsp_ace30_ptl.conf index 4331e820e2c1..38cbaf31d15e 100644 --- a/app/boards/intel_adsp_ace30_ptl.conf +++ b/app/boards/intel_adsp_ace30_ptl.conf @@ -21,8 +21,6 @@ CONFIG_PROBE_DMA_MAX=2 CONFIG_SOF_TELEMETRY=y CONFIG_SOF_TELEMETRY_IO_PERFORMANCE_MEASUREMENTS=y CONFIG_SOF_TELEMETRY_PERFORMANCE_MEASUREMENTS=y -CONFIG_ZEPHYR_DP_SCHEDULER=y -CONFIG_ZEPHYR_NATIVE_DRIVERS=y CONFIG_COLD_STORE_EXECUTE_DRAM=y # SOF / loadable modules @@ -39,7 +37,6 @@ CONFIG_SOF_LOG_LEVEL_INF=y # Zephyr / OS features CONFIG_COUNTER=y CONFIG_HEAP_MEM_POOL_SIZE=8192 -CONFIG_L3_HEAP=y CONFIG_LLEXT=y CONFIG_LLEXT_STORAGE_WRITABLE=y CONFIG_LLEXT_EXPERIMENTAL=y diff --git a/app/boards/intel_adsp_ace30_ptl_sim.conf b/app/boards/intel_adsp_ace30_ptl_sim.conf index 489aa14ca82d..aefa3c50f0e8 100644 --- a/app/boards/intel_adsp_ace30_ptl_sim.conf +++ b/app/boards/intel_adsp_ace30_ptl_sim.conf @@ -10,7 +10,6 @@ CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y CONFIG_PM=n # enable Zephyr drivers -CONFIG_ZEPHYR_NATIVE_DRIVERS=y CONFIG_DAI=y CONFIG_DAI_INIT_PRIORITY=70 CONFIG_DAI_INTEL_DMIC=y diff --git a/app/boards/intel_adsp_ace30_wcl.conf b/app/boards/intel_adsp_ace30_wcl.conf index 47da1f3e79b6..7bb10d2f8ef8 100644 --- a/app/boards/intel_adsp_ace30_wcl.conf +++ b/app/boards/intel_adsp_ace30_wcl.conf @@ -17,8 +17,6 @@ CONFIG_FORMAT_CONVERT_HIFI3=n CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL=n CONFIG_PROBE=y CONFIG_PROBE_DMA_MAX=2 -CONFIG_ZEPHYR_DP_SCHEDULER=y -CONFIG_ZEPHYR_NATIVE_DRIVERS=y CONFIG_COLD_STORE_EXECUTE_DRAM=y # SOF / loadable modules @@ -33,7 +31,6 @@ CONFIG_SOF_LOG_LEVEL_INF=y # Zephyr / OS features CONFIG_HEAP_MEM_POOL_SIZE=8192 -CONFIG_L3_HEAP=y CONFIG_LLEXT=y CONFIG_LLEXT_STORAGE_WRITABLE=y CONFIG_LLEXT_EXPERIMENTAL=y diff --git a/app/boards/intel_adsp_ace30_wcl_sim.conf b/app/boards/intel_adsp_ace30_wcl_sim.conf index c59ec381db3d..d2fbf7fe7596 100644 --- a/app/boards/intel_adsp_ace30_wcl_sim.conf +++ b/app/boards/intel_adsp_ace30_wcl_sim.conf @@ -10,7 +10,6 @@ CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y CONFIG_PM=n # enable Zephyr drivers -CONFIG_ZEPHYR_NATIVE_DRIVERS=y CONFIG_DAI=y CONFIG_DAI_INIT_PRIORITY=70 CONFIG_DAI_INTEL_DMIC=y diff --git a/app/boards/intel_adsp_ace40_nvl.conf b/app/boards/intel_adsp_ace40_nvl.conf index 704827f22038..40e4dce6735f 100644 --- a/app/boards/intel_adsp_ace40_nvl.conf +++ b/app/boards/intel_adsp_ace40_nvl.conf @@ -19,8 +19,6 @@ CONFIG_FORMAT_CONVERT_HIFI3=n # SOF / infrastructure CONFIG_PROBE=y CONFIG_PROBE_DMA_MAX=2 -CONFIG_ZEPHYR_DP_SCHEDULER=y -CONFIG_ZEPHYR_NATIVE_DRIVERS=y # SOF / loadable modules CONFIG_INTEL_MODULES=y @@ -33,7 +31,6 @@ CONFIG_ZEPHYR_LOG=y # Zephyr / OS features CONFIG_HEAP_MEM_POOL_SIZE=8192 -CONFIG_L3_HEAP=y # Zephyr / device drivers CONFIG_CLOCK_CONTROL=y diff --git a/app/boards/intel_adsp_ace40_nvls.conf b/app/boards/intel_adsp_ace40_nvls.conf index e9108473e31d..126868dcba40 100644 --- a/app/boards/intel_adsp_ace40_nvls.conf +++ b/app/boards/intel_adsp_ace40_nvls.conf @@ -20,8 +20,6 @@ CONFIG_FORMAT_CONVERT_HIFI3=n # SOF / infrastructure CONFIG_PROBE=y CONFIG_PROBE_DMA_MAX=2 -CONFIG_ZEPHYR_DP_SCHEDULER=y -CONFIG_ZEPHYR_NATIVE_DRIVERS=y # SOF / loadable modules CONFIG_INTEL_MODULES=y @@ -34,7 +32,6 @@ CONFIG_ZEPHYR_LOG=y # Zephyr / OS features CONFIG_HEAP_MEM_POOL_SIZE=8192 -CONFIG_L3_HEAP=y # Zephyr / device drivers CONFIG_CLOCK_CONTROL=y diff --git a/app/boards/intel_adsp_cavs25.conf b/app/boards/intel_adsp_cavs25.conf index 3983c150bbe0..0be19990e07f 100644 --- a/app/boards/intel_adsp_cavs25.conf +++ b/app/boards/intel_adsp_cavs25.conf @@ -21,7 +21,6 @@ CONFIG_PCM_CONVERTER_FORMAT_S24_3LE=y CONFIG_AMS=y CONFIG_LP_MEMORY_BANKS=1 CONFIG_HP_MEMORY_BANKS=30 -CONFIG_ZEPHYR_NATIVE_DRIVERS=y # SOF / loadable modules CONFIG_INTEL_MODULES=y diff --git a/app/boards/intel_adsp_cavs25_tgph.conf b/app/boards/intel_adsp_cavs25_tgph.conf index 00a04ff27649..eb10bc4d1873 100644 --- a/app/boards/intel_adsp_cavs25_tgph.conf +++ b/app/boards/intel_adsp_cavs25_tgph.conf @@ -20,7 +20,6 @@ CONFIG_PCM_CONVERTER_FORMAT_S24_3LE=y # SOF / infrastructure CONFIG_LP_MEMORY_BANKS=1 CONFIG_HP_MEMORY_BANKS=30 -CONFIG_ZEPHYR_NATIVE_DRIVERS=y # SOF / loadable modules CONFIG_INTEL_MODULES=y From 2729e3f678662d70cd72aabc8c33a0bc6dc7dec2 Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Fri, 12 Sep 2025 12:47:25 +0300 Subject: [PATCH 6/9] app: boards: intel_adsp: move common SOF logging options to defconfig Move common SOF logging configuration options to the shared defconfig file for Intel DSPs. Signed-off-by: Kai Vehmanen --- app/boards/intel_adsp/Kconfig.defconfig | 6 ++++++ app/boards/intel_adsp_ace40_nvl.conf | 1 - app/boards/intel_adsp_ace40_nvls.conf | 1 - 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/boards/intel_adsp/Kconfig.defconfig b/app/boards/intel_adsp/Kconfig.defconfig index b8ce5f3be0f2..8278a1287240 100644 --- a/app/boards/intel_adsp/Kconfig.defconfig +++ b/app/boards/intel_adsp/Kconfig.defconfig @@ -81,6 +81,12 @@ config ZEPHYR_DP_SCHEDULER config ZEPHYR_NATIVE_DRIVERS default y +# SOF / logging +# ---------------------------------------- + +config ZEPHYR_LOG + default y + # Zephyr / logging # ---------------------------------------- diff --git a/app/boards/intel_adsp_ace40_nvl.conf b/app/boards/intel_adsp_ace40_nvl.conf index 40e4dce6735f..eb51f590afc7 100644 --- a/app/boards/intel_adsp_ace40_nvl.conf +++ b/app/boards/intel_adsp_ace40_nvl.conf @@ -27,7 +27,6 @@ CONFIG_LIBRARY_MANAGER=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 diff --git a/app/boards/intel_adsp_ace40_nvls.conf b/app/boards/intel_adsp_ace40_nvls.conf index 126868dcba40..91a0f54e830e 100644 --- a/app/boards/intel_adsp_ace40_nvls.conf +++ b/app/boards/intel_adsp_ace40_nvls.conf @@ -28,7 +28,6 @@ CONFIG_LIBRARY_MANAGER=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 From 8b4511b6b26e16b0d66e9c1cc844406d2f13c22c Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Fri, 12 Sep 2025 13:07:13 +0300 Subject: [PATCH 7/9] app: boards: intel_adsp: move common CLOCK_CONTROL options to defconfig Move common settings for CONFIG_CLOCK_CONTROL_* to the shared defconfig file Intel DSPs. Signed-off-by: Kai Vehmanen --- app/boards/intel_adsp/Kconfig.defconfig | 9 +++++++++ app/boards/intel_adsp_ace15_mtpm.conf | 2 -- app/boards/intel_adsp_ace20_lnl.conf | 2 -- app/boards/intel_adsp_ace30_ptl.conf | 2 -- app/boards/intel_adsp_ace30_ptl_sim.conf | 2 -- app/boards/intel_adsp_ace30_wcl.conf | 2 -- app/boards/intel_adsp_ace30_wcl_sim.conf | 2 -- app/boards/intel_adsp_ace40_nvl.conf | 2 -- app/boards/intel_adsp_ace40_nvls.conf | 2 -- app/boards/intel_adsp_cavs25.conf | 2 -- app/boards/intel_adsp_cavs25_tgph.conf | 2 -- 11 files changed, 9 insertions(+), 20 deletions(-) diff --git a/app/boards/intel_adsp/Kconfig.defconfig b/app/boards/intel_adsp/Kconfig.defconfig index 8278a1287240..2e2415a4b5c2 100644 --- a/app/boards/intel_adsp/Kconfig.defconfig +++ b/app/boards/intel_adsp/Kconfig.defconfig @@ -87,6 +87,15 @@ config ZEPHYR_NATIVE_DRIVERS config ZEPHYR_LOG default y +# Zephyr / device drivers +# ---------------------------------------- + +config CLOCK_CONTROL + default y + +# note: CONFIG_CLOCK_CONTROL_ADSP is enabled by default +# based on DT definition. + # Zephyr / logging # ---------------------------------------- diff --git a/app/boards/intel_adsp_ace15_mtpm.conf b/app/boards/intel_adsp_ace15_mtpm.conf index 97528793dd5d..f149c5979387 100644 --- a/app/boards/intel_adsp_ace15_mtpm.conf +++ b/app/boards/intel_adsp_ace15_mtpm.conf @@ -64,8 +64,6 @@ CONFIG_THREAD_RUNTIME_STATS=y CONFIG_SCHED_THREAD_USAGE=y # 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 diff --git a/app/boards/intel_adsp_ace20_lnl.conf b/app/boards/intel_adsp_ace20_lnl.conf index c1d16fa37deb..6ed2b0dc7947 100644 --- a/app/boards/intel_adsp_ace20_lnl.conf +++ b/app/boards/intel_adsp_ace20_lnl.conf @@ -44,8 +44,6 @@ CONFIG_MODULES=y CONFIG_TIMING_FUNCTIONS=y # Zephyr / device drivers -CONFIG_CLOCK_CONTROL=y -CONFIG_CLOCK_CONTROL_ADSP=y CONFIG_DAI=y CONFIG_DAI_DMIC_HAS_MULTIPLE_LINE_SYNC=y CONFIG_DAI_DMIC_HAS_OWNERSHIP=n diff --git a/app/boards/intel_adsp_ace30_ptl.conf b/app/boards/intel_adsp_ace30_ptl.conf index 38cbaf31d15e..6a5c09e8704b 100644 --- a/app/boards/intel_adsp_ace30_ptl.conf +++ b/app/boards/intel_adsp_ace30_ptl.conf @@ -43,8 +43,6 @@ CONFIG_LLEXT_EXPERIMENTAL=y CONFIG_MODULES=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 diff --git a/app/boards/intel_adsp_ace30_ptl_sim.conf b/app/boards/intel_adsp_ace30_ptl_sim.conf index aefa3c50f0e8..7ffa41255d50 100644 --- a/app/boards/intel_adsp_ace30_ptl_sim.conf +++ b/app/boards/intel_adsp_ace30_ptl_sim.conf @@ -52,6 +52,4 @@ CONFIG_PM_DEVICE_POWER_DOMAIN=n CONFIG_PM_PREWAKEUP_CONV_MODE_CEIL=y CONFIG_COMP_KPB=n -CONFIG_CLOCK_CONTROL_ADSP=y -CONFIG_CLOCK_CONTROL=y CONFIG_USERSPACE=y diff --git a/app/boards/intel_adsp_ace30_wcl.conf b/app/boards/intel_adsp_ace30_wcl.conf index 7bb10d2f8ef8..7dafa278e040 100644 --- a/app/boards/intel_adsp_ace30_wcl.conf +++ b/app/boards/intel_adsp_ace30_wcl.conf @@ -37,8 +37,6 @@ CONFIG_LLEXT_EXPERIMENTAL=y CONFIG_MODULES=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 diff --git a/app/boards/intel_adsp_ace30_wcl_sim.conf b/app/boards/intel_adsp_ace30_wcl_sim.conf index d2fbf7fe7596..df06688c6ec5 100644 --- a/app/boards/intel_adsp_ace30_wcl_sim.conf +++ b/app/boards/intel_adsp_ace30_wcl_sim.conf @@ -50,6 +50,4 @@ CONFIG_PM_DEVICE_POWER_DOMAIN=n CONFIG_PM_PREWAKEUP_CONV_MODE_CEIL=y CONFIG_COMP_KPB=n -CONFIG_CLOCK_CONTROL_ADSP=y -CONFIG_CLOCK_CONTROL=y CONFIG_USERSPACE=y diff --git a/app/boards/intel_adsp_ace40_nvl.conf b/app/boards/intel_adsp_ace40_nvl.conf index eb51f590afc7..ac1eb656e354 100644 --- a/app/boards/intel_adsp_ace40_nvl.conf +++ b/app/boards/intel_adsp_ace40_nvl.conf @@ -32,8 +32,6 @@ CONFIG_SOF_LOG_LEVEL_INF=y CONFIG_HEAP_MEM_POOL_SIZE=8192 # 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 diff --git a/app/boards/intel_adsp_ace40_nvls.conf b/app/boards/intel_adsp_ace40_nvls.conf index 91a0f54e830e..6e19b231484a 100644 --- a/app/boards/intel_adsp_ace40_nvls.conf +++ b/app/boards/intel_adsp_ace40_nvls.conf @@ -33,8 +33,6 @@ CONFIG_SOF_LOG_LEVEL_INF=y CONFIG_HEAP_MEM_POOL_SIZE=8192 # 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 diff --git a/app/boards/intel_adsp_cavs25.conf b/app/boards/intel_adsp_cavs25.conf index 0be19990e07f..54d3cc87ee90 100644 --- a/app/boards/intel_adsp_cavs25.conf +++ b/app/boards/intel_adsp_cavs25.conf @@ -36,8 +36,6 @@ CONFIG_DEBUG_COREDUMP_MEMORY_DUMP_MIN=y CONFIG_HEAP_MEM_POOL_SIZE=8192 # Zephyr / device drivers -CONFIG_CLOCK_CONTROL=y -CONFIG_CLOCK_CONTROL_ADSP=y CONFIG_DAI=y CONFIG_DAI_INIT_PRIORITY=70 CONFIG_DAI_INTEL_SSP=y diff --git a/app/boards/intel_adsp_cavs25_tgph.conf b/app/boards/intel_adsp_cavs25_tgph.conf index eb10bc4d1873..72c9c17835a6 100644 --- a/app/boards/intel_adsp_cavs25_tgph.conf +++ b/app/boards/intel_adsp_cavs25_tgph.conf @@ -35,8 +35,6 @@ CONFIG_DEBUG_COREDUMP_MEMORY_DUMP_MIN=y CONFIG_HEAP_MEM_POOL_SIZE=8192 # Zephyr / device drivers -CONFIG_CLOCK_CONTROL=y -CONFIG_CLOCK_CONTROL_ADSP=y CONFIG_DAI=y CONFIG_DAI_INIT_PRIORITY=70 CONFIG_DAI_INTEL_SSP=y From 522d3ddac79b988e740550e48c10dc211d6d5eda Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Fri, 12 Sep 2025 13:08:23 +0300 Subject: [PATCH 8/9] app: boards: intel_adsp: move common driver settings to shared file Move common Zephyr driver options to the shared defconfig file for Intel DSPs. Signed-off-by: Kai Vehmanen --- app/boards/intel_adsp/Kconfig.defconfig | 16 ++++++++++++++++ app/boards/intel_adsp_ace15_mtpm.conf | 7 ------- app/boards/intel_adsp_ace20_lnl.conf | 7 ------- app/boards/intel_adsp_ace30_ptl.conf | 7 ------- app/boards/intel_adsp_ace30_ptl_sim.conf | 5 ----- app/boards/intel_adsp_ace30_wcl.conf | 7 ------- app/boards/intel_adsp_ace30_wcl_sim.conf | 7 ------- app/boards/intel_adsp_ace40_nvl.conf | 7 ------- app/boards/intel_adsp_ace40_nvls.conf | 7 ------- app/boards/intel_adsp_cavs25.conf | 9 --------- app/boards/intel_adsp_cavs25_tgph.conf | 9 --------- 11 files changed, 16 insertions(+), 72 deletions(-) diff --git a/app/boards/intel_adsp/Kconfig.defconfig b/app/boards/intel_adsp/Kconfig.defconfig index 2e2415a4b5c2..798857e20d39 100644 --- a/app/boards/intel_adsp/Kconfig.defconfig +++ b/app/boards/intel_adsp/Kconfig.defconfig @@ -96,6 +96,22 @@ config CLOCK_CONTROL # note: CONFIG_CLOCK_CONTROL_ADSP is enabled by default # based on DT definition. +config DAI + default y + +config DAI_INTEL_DMIC + default y + +config DAI_INTEL_SSP + default y + +config INTEL_ADSP_IPC + default y + +config INTEL_ADSP_TIMER + default y + + # Zephyr / logging # ---------------------------------------- diff --git a/app/boards/intel_adsp_ace15_mtpm.conf b/app/boards/intel_adsp_ace15_mtpm.conf index f149c5979387..23975c6f5920 100644 --- a/app/boards/intel_adsp_ace15_mtpm.conf +++ b/app/boards/intel_adsp_ace15_mtpm.conf @@ -64,19 +64,12 @@ CONFIG_THREAD_RUNTIME_STATS=y CONFIG_SCHED_THREAD_USAGE=y # Zephyr / device drivers -CONFIG_DAI=y CONFIG_DAI_DMIC_HAS_OWNERSHIP=y CONFIG_DAI_DMIC_HAS_MULTIPLE_LINE_SYNC=y CONFIG_DAI_DMIC_HW_IOCLK=38400000 CONFIG_DAI_INIT_PRIORITY=70 -CONFIG_DAI_INTEL_DMIC=y -CONFIG_DAI_INTEL_DMIC_NHLT=y -CONFIG_DAI_INTEL_SSP=y -CONFIG_DMA=y CONFIG_DMA_DW_LLI_POOL_SIZE=50 CONFIG_DMA_INTEL_ADSP_GPDMA=y -CONFIG_INTEL_ADSP_IPC=y -CONFIG_INTEL_ADSP_TIMER=y CONFIG_MEMORY_WIN_2_SIZE=12288 CONFIG_MM_DRV_INTEL_ADSP_TLB_REMAP_UNUSED_RAM=y CONFIG_MM_DRV_INTEL_VIRTUAL_REGION_COUNT=2 diff --git a/app/boards/intel_adsp_ace20_lnl.conf b/app/boards/intel_adsp_ace20_lnl.conf index 6ed2b0dc7947..af1260cfdeef 100644 --- a/app/boards/intel_adsp_ace20_lnl.conf +++ b/app/boards/intel_adsp_ace20_lnl.conf @@ -44,18 +44,11 @@ CONFIG_MODULES=y CONFIG_TIMING_FUNCTIONS=y # Zephyr / device drivers -CONFIG_DAI=y CONFIG_DAI_DMIC_HAS_MULTIPLE_LINE_SYNC=y CONFIG_DAI_DMIC_HAS_OWNERSHIP=n CONFIG_DAI_DMIC_HW_IOCLK=38400000 CONFIG_DAI_INIT_PRIORITY=70 -CONFIG_DAI_INTEL_DMIC=y -CONFIG_DAI_INTEL_DMIC_NHLT=y -CONFIG_DAI_INTEL_SSP=y -CONFIG_DMA=y CONFIG_DMA_INTEL_ADSP_GPDMA=n -CONFIG_INTEL_ADSP_IPC=y -CONFIG_INTEL_ADSP_TIMER=y CONFIG_MEMORY_WIN_2_SIZE=12288 CONFIG_MM_DRV_INTEL_ADSP_TLB_REMAP_UNUSED_RAM=y CONFIG_MM_DRV_INTEL_VIRTUAL_REGION_COUNT=2 diff --git a/app/boards/intel_adsp_ace30_ptl.conf b/app/boards/intel_adsp_ace30_ptl.conf index 6a5c09e8704b..8e1a5df51f70 100644 --- a/app/boards/intel_adsp_ace30_ptl.conf +++ b/app/boards/intel_adsp_ace30_ptl.conf @@ -43,19 +43,12 @@ CONFIG_LLEXT_EXPERIMENTAL=y CONFIG_MODULES=y # Zephyr / device drivers -CONFIG_DAI=y CONFIG_DAI_INIT_PRIORITY=70 -CONFIG_DAI_INTEL_DMIC=y CONFIG_DAI_DMIC_HW_IOCLK=38400000 -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_DMA=y CONFIG_DMA_INTEL_ADSP_GPDMA=n CONFIG_DMA_DW_LLI_POOL_SIZE=50 -CONFIG_INTEL_ADSP_IPC=y -CONFIG_INTEL_ADSP_TIMER=y CONFIG_MEMORY_WIN_2_SIZE=12288 CONFIG_MM_DRV_INTEL_ADSP_TLB_REMAP_UNUSED_RAM=y CONFIG_MM_DRV_INTEL_VIRTUAL_REGION_COUNT=2 diff --git a/app/boards/intel_adsp_ace30_ptl_sim.conf b/app/boards/intel_adsp_ace30_ptl_sim.conf index 7ffa41255d50..c9e05c29fc67 100644 --- a/app/boards/intel_adsp_ace30_ptl_sim.conf +++ b/app/boards/intel_adsp_ace30_ptl_sim.conf @@ -10,20 +10,15 @@ CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y CONFIG_PM=n # enable Zephyr drivers -CONFIG_DAI=y CONFIG_DAI_INIT_PRIORITY=70 -CONFIG_DAI_INTEL_DMIC=y CONFIG_DAI_DMIC_HW_IOCLK=19200000 -CONFIG_DAI_INTEL_DMIC_NHLT=y CONFIG_DAI_DMIC_HAS_OWNERSHIP=y CONFIG_DAI_DMIC_HAS_MULTIPLE_LINE_SYNC=y CONFIG_DAI_INTEL_SSP=n -CONFIG_DMA=y CONFIG_DMA_INTEL_ADSP_GPDMA=n CONFIG_DMA_DW_LLI_POOL_SIZE=50 CONFIG_INTEL_MODULES=n CONFIG_LIBRARY_MANAGER=n -CONFIG_INTEL_ADSP_TIMER=y CONFIG_HEAP_MEM_POOL_SIZE=8192 CONFIG_RIMAGE_SIGNING_SCHEMA="ptl" diff --git a/app/boards/intel_adsp_ace30_wcl.conf b/app/boards/intel_adsp_ace30_wcl.conf index 7dafa278e040..bedb7d89afa1 100644 --- a/app/boards/intel_adsp_ace30_wcl.conf +++ b/app/boards/intel_adsp_ace30_wcl.conf @@ -37,18 +37,11 @@ CONFIG_LLEXT_EXPERIMENTAL=y CONFIG_MODULES=y # Zephyr / device drivers -CONFIG_DAI=y CONFIG_DAI_INIT_PRIORITY=70 -CONFIG_DAI_INTEL_DMIC=y CONFIG_DAI_DMIC_HW_IOCLK=38400000 -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_DMA=y CONFIG_DMA_INTEL_ADSP_GPDMA=n -CONFIG_INTEL_ADSP_IPC=y -CONFIG_INTEL_ADSP_TIMER=y CONFIG_MM_DRV_INTEL_ADSP_TLB_REMAP_UNUSED_RAM=y CONFIG_MM_DRV_INTEL_VIRTUAL_REGION_COUNT=2 CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000 diff --git a/app/boards/intel_adsp_ace30_wcl_sim.conf b/app/boards/intel_adsp_ace30_wcl_sim.conf index df06688c6ec5..ec2e0187d229 100644 --- a/app/boards/intel_adsp_ace30_wcl_sim.conf +++ b/app/boards/intel_adsp_ace30_wcl_sim.conf @@ -10,15 +10,11 @@ CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y CONFIG_PM=n # enable Zephyr drivers -CONFIG_DAI=y CONFIG_DAI_INIT_PRIORITY=70 -CONFIG_DAI_INTEL_DMIC=y CONFIG_DAI_DMIC_HW_IOCLK=19200000 -CONFIG_DAI_INTEL_DMIC_NHLT=y CONFIG_DAI_DMIC_HAS_OWNERSHIP=y CONFIG_DAI_DMIC_HAS_MULTIPLE_LINE_SYNC=y CONFIG_DAI_INTEL_SSP=n -CONFIG_DMA=y CONFIG_DMA_INTEL_ADSP_GPDMA=n CONFIG_INTEL_MODULES=n CONFIG_LIBRARY_MANAGER=n @@ -40,9 +36,6 @@ CONFIG_SOF_LOG_LEVEL_INF=n CONFIG_SOF_LOG_LEVEL_OFF=y CONFIG_ZEPHYR_LOG=n -CONFIG_INTEL_ADSP_IPC=y - - # Temporary disabled options CONFIG_PM_DEVICE=y CONFIG_PM_DEVICE_RUNTIME=n diff --git a/app/boards/intel_adsp_ace40_nvl.conf b/app/boards/intel_adsp_ace40_nvl.conf index ac1eb656e354..befae81436c9 100644 --- a/app/boards/intel_adsp_ace40_nvl.conf +++ b/app/boards/intel_adsp_ace40_nvl.conf @@ -32,18 +32,11 @@ CONFIG_SOF_LOG_LEVEL_INF=y CONFIG_HEAP_MEM_POOL_SIZE=8192 # Zephyr / device drivers -CONFIG_DAI=y CONFIG_DAI_INIT_PRIORITY=70 -CONFIG_DAI_INTEL_DMIC=y CONFIG_DAI_DMIC_HW_IOCLK=38400000 -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_DMA=y CONFIG_DMA_INTEL_ADSP_GPDMA=n -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 diff --git a/app/boards/intel_adsp_ace40_nvls.conf b/app/boards/intel_adsp_ace40_nvls.conf index 6e19b231484a..75c277922ed2 100644 --- a/app/boards/intel_adsp_ace40_nvls.conf +++ b/app/boards/intel_adsp_ace40_nvls.conf @@ -33,18 +33,11 @@ CONFIG_SOF_LOG_LEVEL_INF=y CONFIG_HEAP_MEM_POOL_SIZE=8192 # Zephyr / device drivers -CONFIG_DAI=y CONFIG_DAI_INIT_PRIORITY=70 -CONFIG_DAI_INTEL_DMIC=y CONFIG_DAI_DMIC_HW_IOCLK=38400000 -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_DMA=y CONFIG_DMA_INTEL_ADSP_GPDMA=n -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 diff --git a/app/boards/intel_adsp_cavs25.conf b/app/boards/intel_adsp_cavs25.conf index 54d3cc87ee90..b25b68eeb580 100644 --- a/app/boards/intel_adsp_cavs25.conf +++ b/app/boards/intel_adsp_cavs25.conf @@ -36,21 +36,12 @@ CONFIG_DEBUG_COREDUMP_MEMORY_DUMP_MIN=y CONFIG_HEAP_MEM_POOL_SIZE=8192 # Zephyr / device drivers -CONFIG_DAI=y CONFIG_DAI_INIT_PRIORITY=70 -CONFIG_DAI_INTEL_SSP=y -CONFIG_DAI_INTEL_DMIC=y -CONFIG_DAI_INTEL_ALH=y -CONFIG_DAI_INTEL_DMIC_NHLT=y -CONFIG_DAI_INTEL_HDA=y CONFIG_DAI_DMIC_HW_IOCLK=38400000 -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 # Zephyr / power settings diff --git a/app/boards/intel_adsp_cavs25_tgph.conf b/app/boards/intel_adsp_cavs25_tgph.conf index 72c9c17835a6..6bc77e92a43f 100644 --- a/app/boards/intel_adsp_cavs25_tgph.conf +++ b/app/boards/intel_adsp_cavs25_tgph.conf @@ -35,21 +35,12 @@ CONFIG_DEBUG_COREDUMP_MEMORY_DUMP_MIN=y CONFIG_HEAP_MEM_POOL_SIZE=8192 # Zephyr / device drivers -CONFIG_DAI=y CONFIG_DAI_INIT_PRIORITY=70 -CONFIG_DAI_INTEL_SSP=y -CONFIG_DAI_INTEL_DMIC=y -CONFIG_DAI_INTEL_ALH=y -CONFIG_DAI_INTEL_DMIC_NHLT=y -CONFIG_DAI_INTEL_HDA=y CONFIG_DAI_DMIC_HW_IOCLK=38400000 -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 # Zephyr / power settings From 7116d1630e5d89f244b8277a00d1f75769f0c174 Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Fri, 12 Sep 2025 13:47:43 +0300 Subject: [PATCH 9/9] app: boards: intel_adsp: move common PM options to shared defconfig Move CONFIG_PM_* options that are shared for all Intel DSPs to the shared defconfig file. Signed-off-by: Kai Vehmanen --- app/boards/intel_adsp/Kconfig.defconfig | 20 ++++++++++++++++++++ app/boards/intel_adsp_ace15_mtpm.conf | 7 ------- app/boards/intel_adsp_ace20_lnl.conf | 7 ------- app/boards/intel_adsp_ace30_ptl.conf | 7 ------- app/boards/intel_adsp_ace30_ptl_sim.conf | 1 - app/boards/intel_adsp_ace30_wcl.conf | 7 ------- app/boards/intel_adsp_ace30_wcl_sim.conf | 1 - app/boards/intel_adsp_ace40_nvl.conf | 7 ------- app/boards/intel_adsp_ace40_nvls.conf | 7 ------- app/boards/intel_adsp_cavs25.conf | 3 --- 10 files changed, 20 insertions(+), 47 deletions(-) diff --git a/app/boards/intel_adsp/Kconfig.defconfig b/app/boards/intel_adsp/Kconfig.defconfig index 798857e20d39..59026e7f7cc4 100644 --- a/app/boards/intel_adsp/Kconfig.defconfig +++ b/app/boards/intel_adsp/Kconfig.defconfig @@ -112,6 +112,26 @@ config INTEL_ADSP_TIMER default y +# # Zephyr / power settings +# ---------------------------------------- + +config PM + default y + +config PM_DEVICE + default y + +config PM_DEVICE_RUNTIME + default y + +config PM_DEVICE_SYSTEM_MANAGED + default y + +config POWER_DOMAIN + default y + +# note: POWER_DOMAIN_INTEL_ADSP will be set based on DT + # Zephyr / logging # ---------------------------------------- diff --git a/app/boards/intel_adsp_ace15_mtpm.conf b/app/boards/intel_adsp_ace15_mtpm.conf index 23975c6f5920..2bf518f375f4 100644 --- a/app/boards/intel_adsp_ace15_mtpm.conf +++ b/app/boards/intel_adsp_ace15_mtpm.conf @@ -79,14 +79,7 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000 # 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_PREWAKEUP_CONV_MODE_CEIL=y -CONFIG_POWER_DOMAIN=y -CONFIG_POWER_DOMAIN_INTEL_ADSP=y # Zephyr / logging CONFIG_LOG_BACKEND_ADSP=n diff --git a/app/boards/intel_adsp_ace20_lnl.conf b/app/boards/intel_adsp_ace20_lnl.conf index af1260cfdeef..986752ae0344 100644 --- a/app/boards/intel_adsp_ace20_lnl.conf +++ b/app/boards/intel_adsp_ace20_lnl.conf @@ -58,14 +58,7 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000 # Zephyr / power settings CONFIG_ADSP_IDLE_CLOCK_GATING=y CONFIG_ADSP_IMR_CONTEXT_SAVE=y -CONFIG_PM=y -CONFIG_PM_DEVICE=y -CONFIG_PM_DEVICE_POWER_DOMAIN=y -CONFIG_PM_DEVICE_RUNTIME=y -CONFIG_PM_DEVICE_SYSTEM_MANAGED=y CONFIG_PM_PREWAKEUP_CONV_MODE_CEIL=y -CONFIG_POWER_DOMAIN=y -CONFIG_POWER_DOMAIN_INTEL_ADSP=y # Zephyr / logging CONFIG_LOG_BACKEND_ADSP=n diff --git a/app/boards/intel_adsp_ace30_ptl.conf b/app/boards/intel_adsp_ace30_ptl.conf index 8e1a5df51f70..a02e8ea6c2f3 100644 --- a/app/boards/intel_adsp_ace30_ptl.conf +++ b/app/boards/intel_adsp_ace30_ptl.conf @@ -56,14 +56,7 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000 # 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_PREWAKEUP_CONV_MODE_CEIL=y -CONFIG_POWER_DOMAIN=y -CONFIG_POWER_DOMAIN_INTEL_ADSP=y # Zephyr / logging CONFIG_LOG_BACKEND_ADSP=n diff --git a/app/boards/intel_adsp_ace30_ptl_sim.conf b/app/boards/intel_adsp_ace30_ptl_sim.conf index c9e05c29fc67..58806d13b315 100644 --- a/app/boards/intel_adsp_ace30_ptl_sim.conf +++ b/app/boards/intel_adsp_ace30_ptl_sim.conf @@ -41,7 +41,6 @@ CONFIG_INTEL_ADSP_IPC=y # Temporary disabled options -CONFIG_PM_DEVICE=y CONFIG_PM_DEVICE_RUNTIME=n CONFIG_PM_DEVICE_POWER_DOMAIN=n CONFIG_PM_PREWAKEUP_CONV_MODE_CEIL=y diff --git a/app/boards/intel_adsp_ace30_wcl.conf b/app/boards/intel_adsp_ace30_wcl.conf index bedb7d89afa1..aba660a511e2 100644 --- a/app/boards/intel_adsp_ace30_wcl.conf +++ b/app/boards/intel_adsp_ace30_wcl.conf @@ -48,14 +48,7 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000 # 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_PREWAKEUP_CONV_MODE_CEIL=y -CONFIG_POWER_DOMAIN=y -CONFIG_POWER_DOMAIN_INTEL_ADSP=y # Zephyr / logging CONFIG_LOG_BACKEND_ADSP=n diff --git a/app/boards/intel_adsp_ace30_wcl_sim.conf b/app/boards/intel_adsp_ace30_wcl_sim.conf index ec2e0187d229..d885cf7eb3e0 100644 --- a/app/boards/intel_adsp_ace30_wcl_sim.conf +++ b/app/boards/intel_adsp_ace30_wcl_sim.conf @@ -37,7 +37,6 @@ CONFIG_SOF_LOG_LEVEL_OFF=y CONFIG_ZEPHYR_LOG=n # Temporary disabled options -CONFIG_PM_DEVICE=y CONFIG_PM_DEVICE_RUNTIME=n CONFIG_PM_DEVICE_POWER_DOMAIN=n CONFIG_PM_PREWAKEUP_CONV_MODE_CEIL=y diff --git a/app/boards/intel_adsp_ace40_nvl.conf b/app/boards/intel_adsp_ace40_nvl.conf index befae81436c9..592ba109a387 100644 --- a/app/boards/intel_adsp_ace40_nvl.conf +++ b/app/boards/intel_adsp_ace40_nvl.conf @@ -42,15 +42,8 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000 # 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_PM_PREWAKEUP_CONV_MODE_CEIL=y -CONFIG_POWER_DOMAIN=y -CONFIG_POWER_DOMAIN_INTEL_ADSP=y CONFIG_SRAM_RETENTION_MODE=n # Zephyr / logging diff --git a/app/boards/intel_adsp_ace40_nvls.conf b/app/boards/intel_adsp_ace40_nvls.conf index 75c277922ed2..95be818421aa 100644 --- a/app/boards/intel_adsp_ace40_nvls.conf +++ b/app/boards/intel_adsp_ace40_nvls.conf @@ -43,15 +43,8 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000 # 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_PM_PREWAKEUP_CONV_MODE_CEIL=y -CONFIG_POWER_DOMAIN=y -CONFIG_POWER_DOMAIN_INTEL_ADSP=y CONFIG_SRAM_RETENTION_MODE=n # Zephyr / logging diff --git a/app/boards/intel_adsp_cavs25.conf b/app/boards/intel_adsp_cavs25.conf index b25b68eeb580..2499eecd8555 100644 --- a/app/boards/intel_adsp_cavs25.conf +++ b/app/boards/intel_adsp_cavs25.conf @@ -45,9 +45,6 @@ CONFIG_DMA_INTEL_ADSP_GPDMA_HAS_LLP=y CONFIG_MM_DRV=y # Zephyr / power settings -CONFIG_PM=y -CONFIG_PM_DEVICE=y -CONFIG_PM_DEVICE_RUNTIME=y CONFIG_PM_POLICY_CUSTOM=y # Zephyr / logging