From 9d27911808607292b92254210ab063fbc257dba9 Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Thu, 21 Aug 2025 15:19:02 +0300 Subject: [PATCH 1/2] audio: aria: remove unncessary Kconfig default Kconfig default is 'n' by default. Remove redundant definition. This also allows later use of board/family specific Kconfig.defconfig files that provide additional rules to set defaults. Signed-off-by: Kai Vehmanen --- app/Kconfig | 1 - src/audio/aria/Kconfig | 1 - 2 files changed, 2 deletions(-) diff --git a/app/Kconfig b/app/Kconfig index 1ea5b4d46f61..0e35e8916398 100644 --- a/app/Kconfig +++ b/app/Kconfig @@ -5,4 +5,3 @@ config SMP_BOOT_DELAY default y if SMP source "Kconfig.zephyr" - diff --git a/src/audio/aria/Kconfig b/src/audio/aria/Kconfig index 8e0f448cc167..51b9cfa3381d 100644 --- a/src/audio/aria/Kconfig +++ b/src/audio/aria/Kconfig @@ -3,7 +3,6 @@ config COMP_ARIA tristate "ARIA component" default m if LIBRARY_DEFAULT_MODULAR - default n depends on IPC_MAJOR_4 help Select for Automatic Regressive Input Amplifier Module component From d0ddcc18e32fd3b3b7b793028316388b609e3256 Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Thu, 21 Aug 2025 15:25:02 +0300 Subject: [PATCH 2/2] app: boards: add common board family definitions for Intel ADSPs SOF builds currently use the board Kconfig file to set any target specific build options. This includes modifying Zephyr build options (if different from Zephyr defaults for the SoC) and setting SOF specific options. There is currently no way to share definitions. For Intel ADSP boards, there starts to be a lot of boards and a lot of duplication of settings. Add a new mechanism to include common Kconfig.defconfig for a family of boards. Start with addition of boards/intel_adsp/Kconfig.defconfig and move defaults for CONFIG_COMP_ARIA and CONFIG_IPC4_BASE_FW_INTEL to the common file. These are options that are not related to hardware features, but we want to set them in the same way for all Intel ADSP targets. Follow-up patches will move more options to the common Kconfig.defconfig and other vendors can add their own board family defconfig files. Signed-off-by: Kai Vehmanen --- app/Kconfig | 4 ++++ app/boards/intel_adsp/Kconfig.defconfig | 10 ++++++++++ app/boards/intel_adsp_ace15_mtpm.conf | 2 -- app/boards/intel_adsp_ace20_lnl.conf | 2 -- app/boards/intel_adsp_ace30_ptl.conf | 1 - app/boards/intel_adsp_ace30_ptl_sim.conf | 1 - app/boards/intel_adsp_ace30_wcl.conf | 1 - app/boards/intel_adsp_ace30_wcl_sim.conf | 1 - app/boards/intel_adsp_cavs25.conf | 2 -- app/boards/intel_adsp_cavs25_tgph.conf | 2 -- 10 files changed, 14 insertions(+), 12 deletions(-) create mode 100644 app/boards/intel_adsp/Kconfig.defconfig diff --git a/app/Kconfig b/app/Kconfig index 0e35e8916398..e1f5bd67295d 100644 --- a/app/Kconfig +++ b/app/Kconfig @@ -5,3 +5,7 @@ config SMP_BOOT_DELAY default y if SMP source "Kconfig.zephyr" + +if SOC_FAMILY_INTEL_ADSP + rsource "boards/intel_adsp/Kconfig.defconfig" +endif diff --git a/app/boards/intel_adsp/Kconfig.defconfig b/app/boards/intel_adsp/Kconfig.defconfig new file mode 100644 index 000000000000..4f1b6f0b9442 --- /dev/null +++ b/app/boards/intel_adsp/Kconfig.defconfig @@ -0,0 +1,10 @@ +# Common defaults for all Intel ADSP SOF targets +# +# SPDX-License-Identifier: BSD-3-Clause + +config IPC4_BASE_FW_INTEL + def_bool y + +config COMP_ARIA + def_tristate m if LIBRARY_DEFAULT_MODULAR + def_tristate y diff --git a/app/boards/intel_adsp_ace15_mtpm.conf b/app/boards/intel_adsp_ace15_mtpm.conf index 288410192b81..6ef6e6de0c73 100644 --- a/app/boards/intel_adsp_ace15_mtpm.conf +++ b/app/boards/intel_adsp_ace15_mtpm.conf @@ -3,10 +3,8 @@ CONFIG_RIMAGE_SIGNING_SCHEMA="mtl" # SOF / IPC configuration CONFIG_IPC_MAJOR_4=y -CONFIG_IPC4_BASE_FW_INTEL=y # SOF / audio pipeline and module settings -CONFIG_COMP_ARIA=y CONFIG_COMP_CHAIN_DMA=y CONFIG_COMP_CROSSOVER=y CONFIG_COMP_DRC=y diff --git a/app/boards/intel_adsp_ace20_lnl.conf b/app/boards/intel_adsp_ace20_lnl.conf index 2d264293f66f..abc361ba3970 100644 --- a/app/boards/intel_adsp_ace20_lnl.conf +++ b/app/boards/intel_adsp_ace20_lnl.conf @@ -3,10 +3,8 @@ CONFIG_RIMAGE_SIGNING_SCHEMA="lnl" # SOF / IPC configuration CONFIG_IPC_MAJOR_4=y -CONFIG_IPC4_BASE_FW_INTEL=y # SOF / audio pipeline and module settings -CONFIG_COMP_ARIA=y CONFIG_COMP_CHAIN_DMA=y CONFIG_COMP_DRC=m CONFIG_COMP_KPB=y diff --git a/app/boards/intel_adsp_ace30_ptl.conf b/app/boards/intel_adsp_ace30_ptl.conf index 6eac290aa74e..fd78d1639a2d 100644 --- a/app/boards/intel_adsp_ace30_ptl.conf +++ b/app/boards/intel_adsp_ace30_ptl.conf @@ -3,7 +3,6 @@ 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_MM_DRV=y diff --git a/app/boards/intel_adsp_ace30_ptl_sim.conf b/app/boards/intel_adsp_ace30_ptl_sim.conf index 34e771a5f2d3..08996e38752d 100644 --- a/app/boards/intel_adsp_ace30_ptl_sim.conf +++ b/app/boards/intel_adsp_ace30_ptl_sim.conf @@ -1,6 +1,5 @@ CONFIG_PANTHERLAKE=y CONFIG_IPC_MAJOR_4=y -CONFIG_IPC4_BASE_FW_INTEL=y # turn off SOF drivers CONFIG_COMP_SRC=y diff --git a/app/boards/intel_adsp_ace30_wcl.conf b/app/boards/intel_adsp_ace30_wcl.conf index 8776c099fa24..7a92c9beab58 100644 --- a/app/boards/intel_adsp_ace30_wcl.conf +++ b/app/boards/intel_adsp_ace30_wcl.conf @@ -3,7 +3,6 @@ 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_MM_DRV=y diff --git a/app/boards/intel_adsp_ace30_wcl_sim.conf b/app/boards/intel_adsp_ace30_wcl_sim.conf index 6daec5544be8..51f5c2c95854 100644 --- a/app/boards/intel_adsp_ace30_wcl_sim.conf +++ b/app/boards/intel_adsp_ace30_wcl_sim.conf @@ -1,6 +1,5 @@ CONFIG_WILDCATLAKE=y CONFIG_IPC_MAJOR_4=y -CONFIG_IPC4_BASE_FW_INTEL=y # turn off SOF drivers CONFIG_COMP_SRC=y diff --git a/app/boards/intel_adsp_cavs25.conf b/app/boards/intel_adsp_cavs25.conf index 3a0857ea2223..617da355db4d 100644 --- a/app/boards/intel_adsp_cavs25.conf +++ b/app/boards/intel_adsp_cavs25.conf @@ -3,10 +3,8 @@ CONFIG_RIMAGE_SIGNING_SCHEMA="tgl-cavs" # SOF / IPC configuration CONFIG_IPC_MAJOR_4=y -CONFIG_IPC4_BASE_FW_INTEL=y # SOF / audio pipeline and module settings -CONFIG_COMP_ARIA=y CONFIG_COMP_CHAIN_DMA=y CONFIG_COMP_CROSSOVER=y CONFIG_COMP_DRC=y diff --git a/app/boards/intel_adsp_cavs25_tgph.conf b/app/boards/intel_adsp_cavs25_tgph.conf index 6ef138429bdf..b4370bdf59a4 100644 --- a/app/boards/intel_adsp_cavs25_tgph.conf +++ b/app/boards/intel_adsp_cavs25_tgph.conf @@ -3,10 +3,8 @@ CONFIG_RIMAGE_SIGNING_SCHEMA="tgl-cavs" # SOF / IPC configuration CONFIG_IPC_MAJOR_4=y -CONFIG_IPC4_BASE_FW_INTEL=y # SOF / audio pipeline and module settings -CONFIG_COMP_ARIA=y CONFIG_COMP_CHAIN_DMA=y CONFIG_COMP_CROSSOVER=y CONFIG_COMP_DRC=y