Skip to content

Commit 3f3e337

Browse files
kv2019ilgirdwood
kv2019i
authored and
lgirdwood
committed
app: boards: share common audio build options 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 common defaults for SOF audio modules 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 53ec0cd commit 3f3e337

13 files changed

Lines changed: 67 additions & 134 deletions

‎Kconfig.sof‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ config COLD_STORE_EXECUTE_DEBUG
3939

4040
config FAST_GET
4141
bool "Enable simple refcounting DRAM data copier"
42-
default n
4342
help
4443
Enable simple refcounting DRAM data copier for copying processing
4544
module data from DRAM to SRAM when the data is needed and freeing

‎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

‎app/boards/intel_adsp/Kconfig.defconfig‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# Common defaults for all Intel ADSP SOF targets
2+
#
3+
# SPDX-License-Identifier: BSD-3-Clause
4+
5+
# SOF / IPC configuration
6+
# -----------------------
7+
8+
config IPC4_BASE_FW_INTEL
9+
default y
10+
11+
# SOF / audio pipeline and module settings
12+
# ----------------------------------------
13+
14+
config COMP_CHAIN_DMA
15+
default y
16+
17+
config FAST_GET
18+
default y
19+
20+
config FORMAT_A_LAW
21+
default y
22+
23+
config FORMAT_FLOAT
24+
default y
25+
26+
config FORMAT_MU_LAW
27+
default y
28+
29+
config FORMAT_U8
30+
default y
31+
32+
config PCM_CONVERTER_FORMAT_A_LAW
33+
default y
34+
35+
config PCM_CONVERTER_FORMAT_FLOAT
36+
default y
37+
38+
config PCM_CONVERTER_FORMAT_MU_LAW
39+
default y
40+
41+
config PCM_CONVERTER_FORMAT_S16_C16_AND_S16_C32
42+
default y
43+
44+
config PCM_CONVERTER_FORMAT_S16_C32_AND_S24_C32
45+
default y
46+
47+
config PCM_CONVERTER_FORMAT_S16_C32_AND_S32_C32
48+
default y
49+
50+
config PCM_CONVERTER_FORMAT_S16_C32_AND_S16_C32
51+
default y
52+
53+
config PCM_CONVERTER_FORMAT_S24_C24_AND_S24_C32
54+
default y
55+
56+
config PCM_CONVERTER_FORMAT_S24_C32_AND_S24_C24
57+
default y
58+
59+
config PCM_CONVERTER_FORMAT_U8
60+
default y
61+
62+
config PIPELINE_2_0
63+
default y

‎app/boards/intel_adsp_ace15_mtpm.conf‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@ 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
98
CONFIG_COMP_ARIA=y
10-
CONFIG_COMP_CHAIN_DMA=y
119
CONFIG_COMP_CROSSOVER=y
1210
CONFIG_COMP_DRC=y
1311
CONFIG_COMP_KPB=y
@@ -19,23 +17,7 @@ CONFIG_COMP_MULTIBAND_DRC=y
1917
CONFIG_COMP_UP_DOWN_MIXER=y
2018
CONFIG_COMP_VOLUME_WINDOWS_FADE=y
2119
CONFIG_FORMAT_CONVERT_HIFI3=n
22-
CONFIG_PCM_CONVERTER_FORMAT_S16_C16_AND_S16_C32=y
23-
CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S32_C32=y
24-
CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S24_C32=y
25-
CONFIG_PCM_CONVERTER_FORMAT_S24_C24_AND_S24_C32=y
26-
CONFIG_PCM_CONVERTER_FORMAT_S24_C32_AND_S24_C24=y
27-
CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S16_C32=y
28-
CONFIG_PIPELINE_2_0=y
2920
CONFIG_SAMPLE_KEYPHRASE=y
30-
CONFIG_FAST_GET=y
31-
CONFIG_FORMAT_U8=y
32-
CONFIG_FORMAT_A_LAW=y
33-
CONFIG_FORMAT_MU_LAW=y
34-
CONFIG_FORMAT_FLOAT=y
35-
CONFIG_PCM_CONVERTER_FORMAT_U8=y
36-
CONFIG_PCM_CONVERTER_FORMAT_A_LAW=y
37-
CONFIG_PCM_CONVERTER_FORMAT_MU_LAW=y
38-
CONFIG_PCM_CONVERTER_FORMAT_FLOAT=y
3921

4022
# SOF / audio modules / mocks
4123
# This mock is part of official sof-bin releases because the CI that

‎app/boards/intel_adsp_ace20_lnl.conf‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,17 @@ 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
98
CONFIG_COMP_ARIA=y
10-
CONFIG_COMP_CHAIN_DMA=y
119
CONFIG_COMP_DRC=m
1210
CONFIG_COMP_KPB=y
1311
CONFIG_COMP_TESTER=m
1412
CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
1513
CONFIG_COMP_UP_DOWN_MIXER=y
1614
CONFIG_COMP_VOLUME_WINDOWS_FADE=y
1715
CONFIG_FORMAT_CONVERT_HIFI3=n
18-
CONFIG_PCM_CONVERTER_FORMAT_S16_C16_AND_S16_C32=y
19-
CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S32_C32=y
20-
CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S24_C32=y
21-
CONFIG_PCM_CONVERTER_FORMAT_S24_C24_AND_S24_C32=y
22-
CONFIG_PCM_CONVERTER_FORMAT_S24_C32_AND_S24_C24=y
23-
CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S16_C32=y
24-
CONFIG_PIPELINE_2_0=y
2516
CONFIG_SAMPLE_KEYPHRASE=y
26-
CONFIG_FAST_GET=y
27-
CONFIG_FORMAT_U8=y
28-
CONFIG_FORMAT_A_LAW=y
29-
CONFIG_FORMAT_MU_LAW=y
30-
CONFIG_FORMAT_FLOAT=y
31-
CONFIG_PCM_CONVERTER_FORMAT_U8=y
32-
CONFIG_PCM_CONVERTER_FORMAT_A_LAW=y
33-
CONFIG_PCM_CONVERTER_FORMAT_MU_LAW=y
34-
CONFIG_PCM_CONVERTER_FORMAT_FLOAT=y
3517

3618
# SOF / infrastructure
3719
CONFIG_AMS=y

‎app/boards/intel_adsp_ace30_ptl.conf‎

Lines changed: 0 additions & 19 deletions
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
@@ -14,24 +13,6 @@ CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
1413
CONFIG_COMP_UP_DOWN_MIXER=y
1514
CONFIG_COMP_VOLUME_WINDOWS_FADE=y
1615
CONFIG_FORMAT_CONVERT_HIFI3=n
17-
CONFIG_FORMAT_U8=y
18-
CONFIG_PCM_CONVERTER_FORMAT_S16_C16_AND_S16_C32=y
19-
CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S32_C32=y
20-
CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S24_C32=y
21-
CONFIG_PCM_CONVERTER_FORMAT_S24_C24_AND_S24_C32=y
22-
CONFIG_PCM_CONVERTER_FORMAT_S24_C32_AND_S24_C24=y
23-
CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S16_C32=y
24-
CONFIG_PCM_CONVERTER_FORMAT_U8=y
25-
CONFIG_PIPELINE_2_0=y
26-
CONFIG_FAST_GET=y
27-
CONFIG_FORMAT_U8=y
28-
CONFIG_FORMAT_A_LAW=y
29-
CONFIG_FORMAT_MU_LAW=y
30-
CONFIG_FORMAT_FLOAT=y
31-
CONFIG_PCM_CONVERTER_FORMAT_U8=y
32-
CONFIG_PCM_CONVERTER_FORMAT_A_LAW=y
33-
CONFIG_PCM_CONVERTER_FORMAT_MU_LAW=y
34-
CONFIG_PCM_CONVERTER_FORMAT_FLOAT=y
3516

3617
# SOF / infrastructure
3718
CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL=n

‎app/boards/intel_adsp_ace30_ptl_sim.conf‎

Lines changed: 0 additions & 7 deletions
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
@@ -31,12 +30,6 @@ CONFIG_HEAP_MEM_POOL_SIZE=8192
3130
CONFIG_RIMAGE_SIGNING_SCHEMA="ptl"
3231

3332
CONFIG_FORMAT_CONVERT_HIFI3=n
34-
CONFIG_PCM_CONVERTER_FORMAT_S16_C16_AND_S16_C32=y
35-
CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S32_C32=y
36-
CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S24_C32=y
37-
CONFIG_PCM_CONVERTER_FORMAT_S24_C24_AND_S24_C32=y
38-
CONFIG_PCM_CONVERTER_FORMAT_S24_C32_AND_S24_C24=y
39-
CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S16_C32=y
4033
CONFIG_LOG=n
4134
CONFIG_LOG_MODE_DEFERRED=n
4235
CONFIG_LOG_FUNC_NAME_PREFIX_INF=n

‎app/boards/intel_adsp_ace30_wcl.conf‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,15 @@ 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
10-
CONFIG_COMP_CHAIN_DMA=y
119
CONFIG_COMP_KPB=y
1210
CONFIG_COMP_TESTER=m
1311
CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
1412
CONFIG_COMP_UP_DOWN_MIXER=y
1513
CONFIG_COMP_VOLUME_WINDOWS_FADE=y
1614
CONFIG_FORMAT_CONVERT_HIFI3=n
17-
CONFIG_FORMAT_U8=y
18-
CONFIG_PCM_CONVERTER_FORMAT_S16_C16_AND_S16_C32=y
19-
CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S32_C32=y
20-
CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S24_C32=y
21-
CONFIG_PCM_CONVERTER_FORMAT_S24_C24_AND_S24_C32=y
22-
CONFIG_PCM_CONVERTER_FORMAT_S24_C32_AND_S24_C24=y
23-
CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S16_C32=y
24-
CONFIG_PCM_CONVERTER_FORMAT_U8=y
25-
CONFIG_PIPELINE_2_0=y
26-
CONFIG_FAST_GET=y
2715

2816
# SOF / infrastructure
2917
CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL=n

‎app/boards/intel_adsp_ace30_wcl_sim.conf‎

Lines changed: 0 additions & 8 deletions
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
@@ -29,13 +28,6 @@ CONFIG_INTEL_ADSP_TIMER=y
2928
CONFIG_HEAP_MEM_POOL_SIZE=8192
3029
CONFIG_RIMAGE_SIGNING_SCHEMA="ptl"
3130

32-
CONFIG_FORMAT_CONVERT_HIFI3=n
33-
CONFIG_PCM_CONVERTER_FORMAT_S16_C16_AND_S16_C32=y
34-
CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S32_C32=y
35-
CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S24_C32=y
36-
CONFIG_PCM_CONVERTER_FORMAT_S24_C24_AND_S24_C32=y
37-
CONFIG_PCM_CONVERTER_FORMAT_S24_C32_AND_S24_C24=y
38-
CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S16_C32=y
3931
CONFIG_LOG=n
4032
CONFIG_LOG_MODE_DEFERRED=n
4133
CONFIG_LOG_FUNC_NAME_PREFIX_INF=n

‎app/boards/intel_adsp_ace40_nvl.conf‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,18 @@ CONFIG_RIMAGE_SIGNING_SCHEMA="nvl"
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_COMP_SRC=y
109
CONFIG_MM_DRV=y
1110
CONFIG_COMP_ARIA=y
12-
CONFIG_COMP_CHAIN_DMA=y
1311
CONFIG_COMP_DRC=y
1412
CONFIG_COMP_KPB=y
1513
CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
1614
CONFIG_COMP_TESTER=y
1715
CONFIG_COMP_UP_DOWN_MIXER=y
1816
CONFIG_COMP_VOLUME_WINDOWS_FADE=y
1917
CONFIG_FORMAT_CONVERT_HIFI3=n
20-
CONFIG_FORMAT_U8=y
21-
CONFIG_PCM_CONVERTER_FORMAT_S16_C16_AND_S16_C32=y
22-
CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S32_C32=y
23-
CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S24_C32=y
24-
CONFIG_PCM_CONVERTER_FORMAT_S24_C24_AND_S24_C32=y
25-
CONFIG_PCM_CONVERTER_FORMAT_S24_C32_AND_S24_C24=y
26-
CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S16_C32=y
27-
CONFIG_PCM_CONVERTER_FORMAT_U8=y
28-
CONFIG_PIPELINE_2_0=y
2918

3019
# SOF / infrastructure
3120
CONFIG_PROBE=y

0 commit comments

Comments
 (0)