Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@ config SMP_BOOT_DELAY

source "Kconfig.zephyr"

if SOC_FAMILY_INTEL_ADSP
rsource "boards/intel_adsp/Kconfig.defconfig"
endif
10 changes: 10 additions & 0 deletions app/boards/intel_adsp/Kconfig.defconfig
Original file line number Diff line number Diff line change
@@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks unorthodox with config COMP_ARIA present in src/audio/aria/Kconfig also.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ujfalusi this is used in Zephyr to set board defaults: e.g. https://github.com/zephyrproject-rtos/zephyr/blob/main/boards/nxp/imx943_evk/Kconfig.defconfig , https://github.com/zephyrproject-rtos/zephyr/blob/main/boards/ruuvi/ruuvitag/Kconfig.defconfig and others.
This does build on the convention to not set redundant "default n" in the main Kconfig definition.

def_tristate m if LIBRARY_DEFAULT_MODULAR
def_tristate y
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this looks like a very modest beginning, but a good start

2 changes: 0 additions & 2 deletions app/boards/intel_adsp_ace15_mtpm.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions app/boards/intel_adsp_ace20_lnl.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion app/boards/intel_adsp_ace30_ptl.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion app/boards/intel_adsp_ace30_ptl_sim.conf
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion app/boards/intel_adsp_ace30_wcl.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion app/boards/intel_adsp_ace30_wcl_sim.conf
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 0 additions & 2 deletions app/boards/intel_adsp_cavs25.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions app/boards/intel_adsp_cavs25_tgph.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/audio/aria/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading