Skip to content

Commit d0ddcc1

Browse files
committed
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 <kai.vehmanen@linux.intel.com>
1 parent 9d27911 commit d0ddcc1

10 files changed

Lines changed: 14 additions & 12 deletions

app/Kconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,7 @@ config SMP_BOOT_DELAY
55
default y if SMP
66

77
source "Kconfig.zephyr"
8+
9+
if SOC_FAMILY_INTEL_ADSP
10+
rsource "boards/intel_adsp/Kconfig.defconfig"
11+
endif
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Common defaults for all Intel ADSP SOF targets
2+
#
3+
# SPDX-License-Identifier: BSD-3-Clause
4+
5+
config IPC4_BASE_FW_INTEL
6+
def_bool y
7+
8+
config COMP_ARIA
9+
def_tristate m if LIBRARY_DEFAULT_MODULAR
10+
def_tristate y

app/boards/intel_adsp_ace15_mtpm.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ CONFIG_RIMAGE_SIGNING_SCHEMA="mtl"
33

44
# SOF / IPC configuration
55
CONFIG_IPC_MAJOR_4=y
6-
CONFIG_IPC4_BASE_FW_INTEL=y
76

87
# SOF / audio pipeline and module settings
9-
CONFIG_COMP_ARIA=y
108
CONFIG_COMP_CHAIN_DMA=y
119
CONFIG_COMP_CROSSOVER=y
1210
CONFIG_COMP_DRC=y

app/boards/intel_adsp_ace20_lnl.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ CONFIG_RIMAGE_SIGNING_SCHEMA="lnl"
33

44
# SOF / IPC configuration
55
CONFIG_IPC_MAJOR_4=y
6-
CONFIG_IPC4_BASE_FW_INTEL=y
76

87
# SOF / audio pipeline and module settings
9-
CONFIG_COMP_ARIA=y
108
CONFIG_COMP_CHAIN_DMA=y
119
CONFIG_COMP_DRC=m
1210
CONFIG_COMP_KPB=y

app/boards/intel_adsp_ace30_ptl.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ CONFIG_RIMAGE_SIGNING_SCHEMA="ptl"
33

44
# SOF / IPC configuration
55
CONFIG_IPC_MAJOR_4=y
6-
CONFIG_IPC4_BASE_FW_INTEL=y
76

87
# SOF / audio pipeline and module settings
98
CONFIG_MM_DRV=y

app/boards/intel_adsp_ace30_ptl_sim.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
CONFIG_PANTHERLAKE=y
22
CONFIG_IPC_MAJOR_4=y
3-
CONFIG_IPC4_BASE_FW_INTEL=y
43

54
# turn off SOF drivers
65
CONFIG_COMP_SRC=y

app/boards/intel_adsp_ace30_wcl.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ CONFIG_RIMAGE_SIGNING_SCHEMA="ptl"
33

44
# SOF / IPC configuration
55
CONFIG_IPC_MAJOR_4=y
6-
CONFIG_IPC4_BASE_FW_INTEL=y
76

87
# SOF / audio pipeline and module settings
98
CONFIG_MM_DRV=y

app/boards/intel_adsp_ace30_wcl_sim.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
CONFIG_WILDCATLAKE=y
22
CONFIG_IPC_MAJOR_4=y
3-
CONFIG_IPC4_BASE_FW_INTEL=y
43

54
# turn off SOF drivers
65
CONFIG_COMP_SRC=y

app/boards/intel_adsp_cavs25.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ CONFIG_RIMAGE_SIGNING_SCHEMA="tgl-cavs"
33

44
# SOF / IPC configuration
55
CONFIG_IPC_MAJOR_4=y
6-
CONFIG_IPC4_BASE_FW_INTEL=y
76

87
# SOF / audio pipeline and module settings
9-
CONFIG_COMP_ARIA=y
108
CONFIG_COMP_CHAIN_DMA=y
119
CONFIG_COMP_CROSSOVER=y
1210
CONFIG_COMP_DRC=y

app/boards/intel_adsp_cavs25_tgph.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ CONFIG_RIMAGE_SIGNING_SCHEMA="tgl-cavs"
33

44
# SOF / IPC configuration
55
CONFIG_IPC_MAJOR_4=y
6-
CONFIG_IPC4_BASE_FW_INTEL=y
76

87
# SOF / audio pipeline and module settings
9-
CONFIG_COMP_ARIA=y
108
CONFIG_COMP_CHAIN_DMA=y
119
CONFIG_COMP_CROSSOVER=y
1210
CONFIG_COMP_DRC=y

0 commit comments

Comments
 (0)