app: boards: share (more) common audio build options for Intel ADSPs

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
 # -----------------------
 
@@ -61,3 +68,87 @@ 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
+
+# SOF / logging
+# ----------------------------------------
+
+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.
+
+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 / 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
+# ----------------------------------------
+
+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

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
 
@@ -67,21 +64,12 @@ 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
 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
@@ -91,25 +79,11 @@ 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
-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

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
@@ -47,20 +44,11 @@ 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
 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
@@ -70,23 +58,10 @@ 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
-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

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,54 +37,29 @@ 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
 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
 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
 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=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

app/boards/intel_adsp_ace30_ptl_sim.conf

@@ -10,21 +10,15 @@ 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
 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"
@@ -47,12 +41,9 @@ 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
 CONFIG_COMP_KPB=n
 
-CONFIG_CLOCK_CONTROL_ADSP=y
-CONFIG_CLOCK_CONTROL=y
 CONFIG_USERSPACE=y

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,52 +31,27 @@ 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
 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
 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
 
 # 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=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