Skip to content

Commit 384d0a0

Browse files
author
Mac Chiang
committed
Merge branch 'master' of https://github.com/macchian/sof into dev-rt722-rt1320
2 parents 8c1cf47 + 1f83b15 commit 384d0a0

162 files changed

Lines changed: 6349 additions & 618 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/sof-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@ jobs:
5656
run: pip install -r sof-docs/scripts/requirements.txt
5757

5858
- name: build sof-docs
59-
run: make -C sof-docs/ html SOF_DOC_BUILD="$(pwd)"/doxybuild/
59+
run: LAX=1 make -C sof-docs/ html SOF_DOC_BUILD="$(pwd)"/doxybuild/

.github/workflows/sparse-zephyr.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ defaults:
1212
shell: bash
1313

1414
jobs:
15+
# disable until https://github.com/zephyrproject-rtos/zephyr/issues/93444
16+
# is fixed
17+
if: false
18+
1519
# As of sparse commit ce1a6720f69e / Sept 2022, the exit status of
1620
# sparse.c is an unusable mess and always zero in practice. Moreover
1721
# SOF has hundreds of sparse warnings right now. So fail only on a

app/boards/intel_adsp_ace15_mtpm.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000
7777
CONFIG_ADSP_IDLE_CLOCK_GATING=y
7878
CONFIG_ADSP_IMR_CONTEXT_SAVE=n
7979
CONFIG_PM_PREWAKEUP_CONV_MODE_CEIL=y
80+
CONFIG_PM_DEVICE_RUNTIME_ASYNC=n
8081

8182
# Zephyr / logging
8283
CONFIG_LOG_BACKEND_ADSP=n

app/boards/intel_adsp_ace20_lnl.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000
5656
CONFIG_ADSP_IDLE_CLOCK_GATING=y
5757
CONFIG_ADSP_IMR_CONTEXT_SAVE=y
5858
CONFIG_PM_PREWAKEUP_CONV_MODE_CEIL=y
59+
CONFIG_PM_DEVICE_RUNTIME_ASYNC=n
5960

6061
# Zephyr / logging
6162
CONFIG_LOG_BACKEND_ADSP=n

app/boards/intel_adsp_ace30_ptl.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000
5858
# Zephyr / power settings
5959
CONFIG_ADSP_IMR_CONTEXT_SAVE=y
6060
CONFIG_PM_PREWAKEUP_CONV_MODE_CEIL=y
61+
CONFIG_PM_DEVICE_RUNTIME_ASYNC=n
6162

6263
# Zephyr / logging
6364
CONFIG_LOG_BACKEND_ADSP=n

app/boards/intel_adsp_ace30_wcl.conf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ CONFIG_COMP_TESTER=m
99
CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
1010
CONFIG_FORMAT_CONVERT_HIFI3=n
1111

12+
# SOF / audio modules / mocks
13+
# This mock is part of official sof-bin releases because the CI that
14+
# tests it can't use extra CONFIGs. See #9410, #8722 and #9386
15+
CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING=m
16+
CONFIG_GOOGLE_RTC_AUDIO_PROCESSING_MOCK=y
17+
1218
# SOF / infrastructure
1319
CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL=n
1420
CONFIG_PROBE=y
@@ -45,6 +51,7 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=12000
4551
# Zephyr / power settings
4652
CONFIG_ADSP_IMR_CONTEXT_SAVE=y
4753
CONFIG_PM_PREWAKEUP_CONV_MODE_CEIL=y
54+
CONFIG_PM_DEVICE_RUNTIME_ASYNC=n
4855

4956
# Zephyr / logging
5057
CONFIG_LOG_BACKEND_ADSP=n

app/boards/intel_adsp_ace40_nvl.conf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,20 @@ CONFIG_COLD_STORE_EXECUTE_DRAM=y
2020
# SOF / loadable modules
2121
CONFIG_INTEL_MODULES=y
2222
CONFIG_LIBRARY_MANAGER=y
23+
CONFIG_LIBRARY_BASE_ADDRESS=0xa0688000
24+
CONFIG_LIBRARY_BUILD_LIB=y
25+
CONFIG_LIBRARY_DEFAULT_MODULAR=y
2326

2427
# SOF / logging
2528
CONFIG_TRACE=n
2629
CONFIG_SOF_LOG_LEVEL_INF=y
2730

2831
# Zephyr / OS features
2932
CONFIG_HEAP_MEM_POOL_SIZE=8192
33+
CONFIG_LLEXT=y
34+
CONFIG_LLEXT_STORAGE_WRITABLE=y
35+
CONFIG_LLEXT_EXPERIMENTAL=y
36+
CONFIG_MODULES=y
3037

3138
# Zephyr / device drivers
3239
CONFIG_DAI_INIT_PRIORITY=70
@@ -42,6 +49,7 @@ CONFIG_ADSP_IMR_CONTEXT_SAVE=y
4249
CONFIG_PM_POLICY_CUSTOM=y
4350
CONFIG_PM_PREWAKEUP_CONV_MODE_CEIL=y
4451
CONFIG_SRAM_RETENTION_MODE=n
52+
CONFIG_PM_DEVICE_RUNTIME_ASYNC=n
4553

4654
# Zephyr / logging
4755
CONFIG_LOG_BACKEND_ADSP=n

app/boards/intel_adsp_ace40_nvls.conf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,20 @@ CONFIG_COLD_STORE_EXECUTE_DRAM=y
2020
# SOF / loadable modules
2121
CONFIG_INTEL_MODULES=y
2222
CONFIG_LIBRARY_MANAGER=y
23+
CONFIG_LIBRARY_BASE_ADDRESS=0xa0688000
24+
CONFIG_LIBRARY_BUILD_LIB=y
25+
CONFIG_LIBRARY_DEFAULT_MODULAR=y
2326

2427
# SOF / logging
2528
CONFIG_TRACE=n
2629
CONFIG_SOF_LOG_LEVEL_INF=y
2730

2831
# Zephyr / OS features
2932
CONFIG_HEAP_MEM_POOL_SIZE=8192
33+
CONFIG_LLEXT=y
34+
CONFIG_LLEXT_STORAGE_WRITABLE=y
35+
CONFIG_LLEXT_EXPERIMENTAL=y
36+
CONFIG_MODULES=y
3037

3138
# Zephyr / device drivers
3239
CONFIG_DAI_INIT_PRIORITY=70
@@ -42,6 +49,7 @@ CONFIG_ADSP_IMR_CONTEXT_SAVE=y
4249
CONFIG_PM_POLICY_CUSTOM=y
4350
CONFIG_PM_PREWAKEUP_CONV_MODE_CEIL=y
4451
CONFIG_SRAM_RETENTION_MODE=n
52+
CONFIG_PM_DEVICE_RUNTIME_ASYNC=n
4553

4654
# Zephyr / logging
4755
CONFIG_LOG_BACKEND_ADSP=n

app/boards/mt8365_mt8365_adsp.conf

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Boilerplate. Because the "Platform" is a kconfig "choice" (of which
2+
# "MTK" is an member), it can't be selected automatically from other
3+
# kconfigs, nor expressed as a default. Don't put anything else here.
4+
# Board-level config goes in Zephyr (and ideally in DTS). App-level
5+
# config goes in prj.conf.
6+
CONFIG_MTK=y
7+
8+
# Override project default setting so 1 millisecond is exactly
9+
# represented by an integral number of ticks.
10+
CONFIG_SYS_CLOCK_TICKS_PER_SEC=13000

app/overlays/mtl/dax_overlay.conf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
CONFIG_COMP_MODULE_ADAPTER=y
2+
CONFIG_COMP_DOLBY_DAX_AUDIO_PROCESSING=y
3+
CONFIG_COMP_DOLBY_DAX_AUDIO_PROCESSING_MOCK=n
4+
CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL=n

0 commit comments

Comments
 (0)