Skip to content

Commit 4367c1b

Browse files
kv2019ikv2019i
committed
app: boards: intel_adsp: use common definitions for SOF infra options
Move common SOF instrastucture configuration options to the shared defconfigfile for Intel DSPs. Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
1 parent 94b8423 commit 4367c1b

11 files changed

Lines changed: 12 additions & 22 deletions

‎app/boards/intel_adsp/Kconfig.defconfig‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,18 @@ config PCM_CONVERTER_FORMAT_U8
6969
config PIPELINE_2_0
7070
default y
7171

72+
# SOF / infrastructure
73+
# ----------------------------------------
74+
75+
config L3_HEAP
76+
default y if ACE
77+
78+
config ZEPHYR_DP_SCHEDULER
79+
default y
80+
81+
config ZEPHYR_NATIVE_DRIVERS
82+
default y
83+
7284
# Zephyr / logging
7385
# ----------------------------------------
7486

‎app/boards/intel_adsp_ace15_mtpm.conf‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,12 @@ CONFIG_GOOGLE_RTC_AUDIO_PROCESSING_MOCK=y
2929
CONFIG_AMS=y
3030
CONFIG_COUNTER=y
3131
CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL=y
32-
CONFIG_L3_HEAP=y
3332
CONFIG_LL_WATCHDOG=y
3433
CONFIG_PROBE=y
3534
CONFIG_PROBE_DMA_MAX=2
3635
CONFIG_SOF_TELEMETRY=y
3736
CONFIG_SOF_TELEMETRY_IO_PERFORMANCE_MEASUREMENTS=y
3837
CONFIG_SOF_TELEMETRY_PERFORMANCE_MEASUREMENTS=y
39-
CONFIG_ZEPHYR_NATIVE_DRIVERS=y
40-
CONFIG_ZEPHYR_DP_SCHEDULER=y
4138
CONFIG_ZEPHYR_TWB_SCHEDULER=y
4239
CONFIG_COLD_STORE_EXECUTE_DRAM=y
4340

‎app/boards/intel_adsp_ace20_lnl.conf‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,11 @@ CONFIG_SAMPLE_KEYPHRASE=y
1818
# SOF / infrastructure
1919
CONFIG_AMS=y
2020
CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL=n
21-
CONFIG_L3_HEAP=y
2221
CONFIG_PROBE=y
2322
CONFIG_PROBE_DMA_MAX=2
2423
CONFIG_SOF_TELEMETRY=y
2524
CONFIG_SOF_TELEMETRY_IO_PERFORMANCE_MEASUREMENTS=y
2625
CONFIG_SOF_TELEMETRY_PERFORMANCE_MEASUREMENTS=y
27-
CONFIG_ZEPHYR_DP_SCHEDULER=y
28-
CONFIG_ZEPHYR_NATIVE_DRIVERS=y
2926
CONFIG_COLD_STORE_EXECUTE_DRAM=y
3027

3128
# SOF / loadable modules

‎app/boards/intel_adsp_ace30_ptl.conf‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ CONFIG_PROBE_DMA_MAX=2
2121
CONFIG_SOF_TELEMETRY=y
2222
CONFIG_SOF_TELEMETRY_IO_PERFORMANCE_MEASUREMENTS=y
2323
CONFIG_SOF_TELEMETRY_PERFORMANCE_MEASUREMENTS=y
24-
CONFIG_ZEPHYR_DP_SCHEDULER=y
25-
CONFIG_ZEPHYR_NATIVE_DRIVERS=y
2624
CONFIG_COLD_STORE_EXECUTE_DRAM=y
2725

2826
# SOF / loadable modules
@@ -39,7 +37,6 @@ CONFIG_SOF_LOG_LEVEL_INF=y
3937
# Zephyr / OS features
4038
CONFIG_COUNTER=y
4139
CONFIG_HEAP_MEM_POOL_SIZE=8192
42-
CONFIG_L3_HEAP=y
4340
CONFIG_LLEXT=y
4441
CONFIG_LLEXT_STORAGE_WRITABLE=y
4542
CONFIG_LLEXT_EXPERIMENTAL=y

‎app/boards/intel_adsp_ace30_ptl_sim.conf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
1010
CONFIG_PM=n
1111

1212
# enable Zephyr drivers
13-
CONFIG_ZEPHYR_NATIVE_DRIVERS=y
1413
CONFIG_DAI=y
1514
CONFIG_DAI_INIT_PRIORITY=70
1615
CONFIG_DAI_INTEL_DMIC=y

‎app/boards/intel_adsp_ace30_wcl.conf‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ CONFIG_FORMAT_CONVERT_HIFI3=n
1717
CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL=n
1818
CONFIG_PROBE=y
1919
CONFIG_PROBE_DMA_MAX=2
20-
CONFIG_ZEPHYR_DP_SCHEDULER=y
21-
CONFIG_ZEPHYR_NATIVE_DRIVERS=y
2220
CONFIG_COLD_STORE_EXECUTE_DRAM=y
2321

2422
# SOF / loadable modules
@@ -33,7 +31,6 @@ CONFIG_SOF_LOG_LEVEL_INF=y
3331

3432
# Zephyr / OS features
3533
CONFIG_HEAP_MEM_POOL_SIZE=8192
36-
CONFIG_L3_HEAP=y
3734
CONFIG_LLEXT=y
3835
CONFIG_LLEXT_STORAGE_WRITABLE=y
3936
CONFIG_LLEXT_EXPERIMENTAL=y

‎app/boards/intel_adsp_ace30_wcl_sim.conf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
1010
CONFIG_PM=n
1111

1212
# enable Zephyr drivers
13-
CONFIG_ZEPHYR_NATIVE_DRIVERS=y
1413
CONFIG_DAI=y
1514
CONFIG_DAI_INIT_PRIORITY=70
1615
CONFIG_DAI_INTEL_DMIC=y

‎app/boards/intel_adsp_ace40_nvl.conf‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ CONFIG_FORMAT_CONVERT_HIFI3=n
1919
# SOF / infrastructure
2020
CONFIG_PROBE=y
2121
CONFIG_PROBE_DMA_MAX=2
22-
CONFIG_ZEPHYR_DP_SCHEDULER=y
23-
CONFIG_ZEPHYR_NATIVE_DRIVERS=y
2422

2523
# SOF / loadable modules
2624
CONFIG_INTEL_MODULES=y
@@ -33,7 +31,6 @@ CONFIG_ZEPHYR_LOG=y
3331

3432
# Zephyr / OS features
3533
CONFIG_HEAP_MEM_POOL_SIZE=8192
36-
CONFIG_L3_HEAP=y
3734

3835
# Zephyr / device drivers
3936
CONFIG_CLOCK_CONTROL=y

‎app/boards/intel_adsp_ace40_nvls.conf‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ CONFIG_FORMAT_CONVERT_HIFI3=n
2020
# SOF / infrastructure
2121
CONFIG_PROBE=y
2222
CONFIG_PROBE_DMA_MAX=2
23-
CONFIG_ZEPHYR_DP_SCHEDULER=y
24-
CONFIG_ZEPHYR_NATIVE_DRIVERS=y
2523

2624
# SOF / loadable modules
2725
CONFIG_INTEL_MODULES=y
@@ -34,7 +32,6 @@ CONFIG_ZEPHYR_LOG=y
3432

3533
# Zephyr / OS features
3634
CONFIG_HEAP_MEM_POOL_SIZE=8192
37-
CONFIG_L3_HEAP=y
3835

3936
# Zephyr / device drivers
4037
CONFIG_CLOCK_CONTROL=y

‎app/boards/intel_adsp_cavs25.conf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ CONFIG_PCM_CONVERTER_FORMAT_S24_3LE=y
2121
CONFIG_AMS=y
2222
CONFIG_LP_MEMORY_BANKS=1
2323
CONFIG_HP_MEMORY_BANKS=30
24-
CONFIG_ZEPHYR_NATIVE_DRIVERS=y
2524

2625
# SOF / loadable modules
2726
CONFIG_INTEL_MODULES=y

0 commit comments

Comments
 (0)