Skip to content

Commit 1edcd91

Browse files
committed
app: intel_adsp_ace20_lnl.conf: clean up board config file
Group the configuration options per theme, separate SOF and Zephyr Kconfig settings and order the entries in alphabetical order within each group. This makes the board config file much more readable and easy to maintain. Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
1 parent 5dfc2d5 commit 1edcd91

File tree

1 file changed

+73
-71
lines changed

1 file changed

+73
-71
lines changed
Lines changed: 73 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,98 @@
11
CONFIG_LUNARLAKE=y
2+
CONFIG_RIMAGE_SIGNING_SCHEMA="lnl"
3+
4+
# SOF / IPC configuration
25
CONFIG_IPC_MAJOR_4=y
36
CONFIG_IPC4_BASE_FW_INTEL=y
47

5-
CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
8+
# SOF / audio pipeline and module settings
9+
CONFIG_COMP_ARIA=y
10+
CONFIG_COMP_CHAIN_DMA=y
611
CONFIG_COMP_DRC=m
7-
8-
# power settings
9-
CONFIG_PM=y
10-
CONFIG_PM_DEVICE=y
11-
CONFIG_PM_DEVICE_RUNTIME=y
12-
CONFIG_PM_DEVICE_SYSTEM_MANAGED=y
13-
CONFIG_PM_DEVICE_POWER_DOMAIN=y
14-
CONFIG_PM_POLICY_CUSTOM=y
15-
CONFIG_ADSP_IMR_CONTEXT_SAVE=y
16-
CONFIG_ADSP_IDLE_CLOCK_GATING=y
17-
18-
CONFIG_POWER_DOMAIN=y
19-
CONFIG_POWER_DOMAIN_INTEL_ADSP=y
20-
21-
# enable Zephyr drivers
22-
CONFIG_ZEPHYR_NATIVE_DRIVERS=y
23-
CONFIG_DAI=y
24-
CONFIG_DAI_INIT_PRIORITY=70
25-
CONFIG_DAI_INTEL_DMIC=y
26-
CONFIG_DAI_DMIC_HW_IOCLK=38400000
27-
CONFIG_DAI_INTEL_DMIC_NHLT=y
28-
CONFIG_DAI_DMIC_HAS_OWNERSHIP=n
29-
CONFIG_DAI_DMIC_HAS_MULTIPLE_LINE_SYNC=y
30-
CONFIG_DAI_INTEL_SSP=y
31-
CONFIG_PIPELINE_2_0=y
32-
CONFIG_ZEPHYR_DP_SCHEDULER=y
33-
CONFIG_DMA=y
34-
CONFIG_DMA_INTEL_ADSP_GPDMA=n
35-
CONFIG_INTEL_MODULES=y
36-
CONFIG_LIBRARY_MANAGER=y
37-
CONFIG_LIBRARY_AUTH_SUPPORT=y
38-
CONFIG_INTEL_ADSP_TIMER=y
39-
CONFIG_MM_DRV_INTEL_ADSP_TLB_REMAP_UNUSED_RAM=y
40-
CONFIG_AMS=y
41-
CONFIG_COUNTER=y
42-
CONFIG_SOF_TELEMETRY=y
43-
CONFIG_SOF_TELEMETRY_PERFORMANCE_MEASUREMENTS=y
44-
CONFIG_SOF_TELEMETRY_IO_PERFORMANCE_MEASUREMENTS=y
45-
46-
CONFIG_HEAP_MEM_POOL_SIZE=8192
47-
CONFIG_L3_HEAP=y
48-
CONFIG_RIMAGE_SIGNING_SCHEMA="lnl"
49-
12+
CONFIG_COMP_KPB=y
13+
CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
14+
CONFIG_COMP_UP_DOWN_MIXER=y
15+
CONFIG_COMP_VOLUME_WINDOWS_FADE=y
5016
CONFIG_FORMAT_CONVERT_HIFI3=n
5117
CONFIG_PCM_CONVERTER_FORMAT_S16_C16_AND_S16_C32=y
5218
CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S32_C32=y
5319
CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S24_C32=y
5420
CONFIG_PCM_CONVERTER_FORMAT_S24_C24_AND_S24_C32=y
5521
CONFIG_PCM_CONVERTER_FORMAT_S24_C32_AND_S24_C24=y
5622
CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S16_C32=y
57-
CONFIG_LOG_FUNC_NAME_PREFIX_ERR=y
58-
CONFIG_LOG_FUNC_NAME_PREFIX_WRN=y
59-
CONFIG_LOG_FUNC_NAME_PREFIX_INF=y
60-
CONFIG_LOG_FUNC_NAME_PREFIX_DBG=y
61-
CONFIG_COMP_VOLUME_WINDOWS_FADE=y
62-
CONFIG_COMP_UP_DOWN_MIXER=y
63-
CONFIG_COMP_CHAIN_DMA=y
23+
CONFIG_PIPELINE_2_0=y
6424
CONFIG_SAMPLE_KEYPHRASE=y
65-
CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000
66-
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=38400000
67-
68-
CONFIG_LOG_BACKEND_ADSP_MTRACE=y
69-
CONFIG_SOF_LOG_LEVEL_INF=y
70-
CONFIG_ZEPHYR_LOG=y
71-
CONFIG_LOG_OUTPUT_FORMAT_LINUX_TIMESTAMP=y
72-
CONFIG_LOG_BACKEND_ADSP=n
73-
CONFIG_WINSTREAM_CONSOLE=n
74-
75-
CONFIG_INTEL_ADSP_IPC=y
7625

26+
# SOF / infrastructure
27+
CONFIG_AMS=y
28+
CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL=y
29+
CONFIG_L3_HEAP=y
7730
CONFIG_PROBE=y
7831
CONFIG_PROBE_DMA_MAX=2
32+
CONFIG_SOF_TELEMETRY=y
33+
CONFIG_SOF_TELEMETRY_IO_PERFORMANCE_MEASUREMENTS=y
34+
CONFIG_SOF_TELEMETRY_PERFORMANCE_MEASUREMENTS=y
35+
CONFIG_ZEPHYR_DP_SCHEDULER=y
36+
CONFIG_ZEPHYR_NATIVE_DRIVERS=y
7937

80-
CONFIG_MEMORY_WIN_2_SIZE=12288
38+
# SOF / loadable modules
39+
CONFIG_INTEL_MODULES=y
40+
CONFIG_LIBRARY_AUTH_SUPPORT=y
41+
CONFIG_LIBRARY_BASE_ADDRESS=0xa0688000
42+
CONFIG_LIBRARY_MANAGER=y
8143

44+
# SOF / logging
45+
CONFIG_SOF_LOG_LEVEL_INF=y
46+
CONFIG_TRACE=n
47+
48+
# Zephyr / OS features
49+
CONFIG_COUNTER=y
50+
CONFIG_HEAP_MEM_POOL_SIZE=8192
8251
CONFIG_LLEXT=y
8352
CONFIG_LLEXT_STORAGE_WRITABLE=y
8453
CONFIG_MODULES=y
85-
CONFIG_LIBRARY_BASE_ADDRESS=0xa0688000
86-
8754
CONFIG_TIMING_FUNCTIONS=y
88-
CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL=y
8955

90-
# Temporary disabled options
91-
CONFIG_TRACE=n
92-
CONFIG_COMP_KPB=y
93-
CONFIG_COMP_ARIA=y
94-
CONFIG_CLOCK_CONTROL_ADSP=y
56+
# Zephyr / device drivers
9557
CONFIG_CLOCK_CONTROL=y
58+
CONFIG_CLOCK_CONTROL_ADSP=y
59+
CONFIG_DAI=y
60+
CONFIG_DAI_DMIC_HAS_MULTIPLE_LINE_SYNC=y
61+
CONFIG_DAI_DMIC_HAS_OWNERSHIP=n
62+
CONFIG_DAI_DMIC_HW_IOCLK=38400000
63+
CONFIG_DAI_INIT_PRIORITY=70
64+
CONFIG_DAI_INTEL_DMIC=y
65+
CONFIG_DAI_INTEL_DMIC_NHLT=y
66+
CONFIG_DAI_INTEL_SSP=y
67+
CONFIG_DMA=y
68+
CONFIG_DMA_INTEL_ADSP_GPDMA=n
69+
CONFIG_INTEL_ADSP_IPC=y
70+
CONFIG_INTEL_ADSP_TIMER=y
71+
CONFIG_MEMORY_WIN_2_SIZE=12288
72+
CONFIG_MM_DRV_INTEL_ADSP_TLB_REMAP_UNUSED_RAM=y
73+
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=38400000
74+
CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000
75+
76+
# Zephyr / power settings
77+
CONFIG_ADSP_IDLE_CLOCK_GATING=y
78+
CONFIG_ADSP_IMR_CONTEXT_SAVE=y
79+
CONFIG_PM=y
80+
CONFIG_PM_DEVICE=y
81+
CONFIG_PM_DEVICE_POWER_DOMAIN=y
82+
CONFIG_PM_DEVICE_RUNTIME=y
83+
CONFIG_PM_DEVICE_SYSTEM_MANAGED=y
84+
CONFIG_PM_POLICY_CUSTOM=y
85+
CONFIG_POWER_DOMAIN=y
86+
CONFIG_POWER_DOMAIN_INTEL_ADSP=y
87+
88+
# Zephyr / logging
89+
CONFIG_LOG_BACKEND_ADSP=n
90+
CONFIG_LOG_BACKEND_ADSP_MTRACE=y
91+
CONFIG_LOG_FUNC_NAME_PREFIX_ERR=y
92+
CONFIG_LOG_FUNC_NAME_PREFIX_WRN=y
93+
CONFIG_LOG_FUNC_NAME_PREFIX_INF=y
94+
CONFIG_LOG_FUNC_NAME_PREFIX_DBG=y
95+
CONFIG_LOG_OUTPUT_FORMAT_LINUX_TIMESTAMP=y
9696
CONFIG_LOG_TIMESTAMP_64BIT=y
97+
CONFIG_WINSTREAM_CONSOLE=n
98+
CONFIG_ZEPHYR_LOG=y

0 commit comments

Comments
 (0)