cmake/zephyr: src/audio/CMakeLists.txt unification part 3#9918
Merged
kv2019i merged 11 commits intothesofproject:mainfrom Apr 1, 2025
Merged
cmake/zephyr: src/audio/CMakeLists.txt unification part 3#9918kv2019i merged 11 commits intothesofproject:mainfrom
kv2019i merged 11 commits intothesofproject:mainfrom
Conversation
kv2019i
commented
Mar 21, 2025
kv2019i
commented
Mar 21, 2025
Adding all source files in a single, giant zephyr/CMakeLists.txt is inconvenient and does not scale. Modify Zephyr rules to use definitions in src/audio/module_adapter/ instead. This commit only moves the common adapter code. The codec build rules are still separate. Link: thesofproject#8260 Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Adding all source files in a single, giant zephyr/CMakeLists.txt is inconvenient and does not scale. Modify Zephyr rules for Intel IADK and Cadence codec modules to use definitions in src/audio/module_adapter/ instead. Link: thesofproject#8260 Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Adding all source files in a single, giant zephyr/CMakeLists.txt is inconvenient and does not scale. Modify Zephyr rules to use definitions in src/audio/module_adapter/ to build Waves codec. Link: thesofproject#8260 Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Fix the cmake style to match Zephyr cmake style. The file had 8 space indents with one stray tab, so not matching anything else in the codebase and non consistent even within this one file. Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Adding all source files in a single, giant zephyr/CMakeLists.txt is inconvenient and does not scale. Modify Zephyr rules to use definitions in src/audio/codec instead to build for CONFIG_DTS_CODEC. Link: thesofproject#8260 Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Adding all source files in a single, giant zephyr/CMakeLists.txt is inconvenient and does not scale. Modify Zephyr rules to use definitions in src/audio/google instead to build Google CTS and RTC modules. Link: thesofproject#8260 Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Adding all source files in a single, giant zephyr/CMakeLists.txt is inconvenient and does not scale. Modify Zephyr rules to use definitions in src/audio/smart_amp instead. Link: thesofproject#8260 Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Adding all source files in a single, giant zephyr/CMakeLists.txt is inconvenient and does not scale. Modify Zephyr rules to use definitions in src/audio/igo_nr instead. Link: thesofproject#8260 Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Adding all source files in a single, giant zephyr/CMakeLists.txt is inconvenient and does not scale. Modify Zephyr rules to use definitions in src/audio/google/ instead. Link: thesofproject#8260 Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Adding all source files in a single, giant zephyr/CMakeLists.txt is inconvenient and does not scale. Modify Zephyr rules to use definitions in src/audio/rtnr instead. Link: thesofproject#8260 Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Adding all source files in a single, giant zephyr/CMakeLists.txt is inconvenient and does not scale. Modify Zephyr rules to use definitions in src/audio/mic_privacy instead. Link: thesofproject#8260 Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
kv2019i
force-pushed
the
202403-cmake-decentr-audio-part3
branch
from
7d0260d to
191abcf
Compare
kv2019i
changed the title
kv2019i
requested review from
a team,
abonislawski,
dbaluta,
iuliana-prodan,
jxstelter,
lbetlej,
lgirdwood,
lyakh,
mmaka1,
plbossart and
ranj063
as code owners
Collaborator
Author
|
Note to reviewers: this PR moves build rules for some non-public libraries I am not able to test. I've moved the rules as is from sof/zephyr/ to sof/src/audio/ . Please check there are no surprises. FYI @thesofproject/google for Google components and common Chromebook modules |
lgirdwood
approved these changes
Mar 26, 2025
lyakh
approved these changes
Mar 26, 2025
Collaborator
lyakh
left a comment
lyakh
left a comment
There was a problem hiding this comment.
looks good:
[ 21.045063] kernel: snd_sof:sof_ipc4_load_library: sof-audio-pci-intel-ptl 0000:00:1f.3: Library file 'intel/sof-ipc4/ptl/dbgkey/sof-ptl-openmodules.ri' loaded
[ 21.045066] kernel: sof-audio-pci-intel-ptl 0000:00:1f.3: Loaded firmware library: ADSPFW, version: 2.12.99.1
[ 21.045069] kernel: snd_sof:sof_ipc4_fw_parse_ext_man: sof-audio-pci-intel-ptl 0000:00:1f.3: Header length: 52, module count: 17
[ 21.045072] kernel: snd_sof:sof_ipc4_fw_parse_ext_man: sof-audio-pci-intel-ptl 0000:00:1f.3: module FIR: UUID 93446E12-1864-4E04-AFE0-3B1D778FFB79
[ 21.045075] kernel: snd_sof:sof_ipc4_fw_parse_ext_man: sof-audio-pci-intel-ptl 0000:00:1f.3: module IIR: UUID B0CDCD9E-EF8B-404F-8480-0F287FC9D44D
[ 21.045077] kernel: snd_sof:sof_ipc4_fw_parse_ext_man: sof-audio-pci-intel-ptl 0000:00:1f.3: module ARIA: UUID 99F7166D-372C-43EF-81F6-22007AA15F03 cfg_count: 6, bss_size: 0x104
[ 21.045079] kernel: snd_sof:sof_ipc4_fw_parse_ext_man: sof-audio-pci-intel-ptl 0000:00:1f.3: module ASRC: UUID 66B4402D-B468-42F2-81A7-B37121863DD4 cfg_count: 16, bss_size: 0x5000
[ 21.045081] kernel: snd_sof:sof_ipc4_fw_parse_ext_man: sof-audio-pci-intel-ptl 0000:00:1f.3: module XOVER: UUID 948C9AD1-806A-4131-AD6C-B2BDA9E35A9F cfg_count: 1, bss_size: 0x1000
[ 21.045083] kernel: snd_sof:sof_ipc4_fw_parse_ext_man: sof-audio-pci-intel-ptl 0000:00:1f.3: module DRC: UUID B36EE4DA-006F-47F9-A06D-FECBE2D8B6CE cfg_count: 1, bss_size: 0x1000
[ 21.045085] kernel: snd_sof:sof_ipc4_fw_parse_ext_man: sof-audio-pci-intel-ptl 0000:00:1f.3: module EQFIR: UUID 43A90CE7-F3A5-41DF-AC06-BA98651AE6A3 cfg_count: 1, bss_size: 0x1000
[ 21.045086] kernel: snd_sof:sof_ipc4_fw_parse_ext_man: sof-audio-pci-intel-ptl 0000:00:1f.3: module EQIIR: UUID 5150C0E6-27F9-4EC8-8351-C705B642D12F cfg_count: 1, bss_size: 0x1000
[ 21.045088] kernel: snd_sof:sof_ipc4_fw_parse_ext_man: sof-audio-pci-intel-ptl 0000:00:1f.3: module MIXIN: UUID 39656EB2-3B71-4049-8D3F-F92CD5C43C09 cfg_count: 10, bss_size: 0x128
[ 21.045090] kernel: snd_sof:sof_ipc4_fw_parse_ext_man: sof-audio-pci-intel-ptl 0000:00:1f.3: module MIXOUT: UUID 3C56505A-24D7-418F-BDDC-C1F5A3AC2AE0 cfg_count: 8, bss_size: 0x208
[ 21.045091] kernel: snd_sof:sof_ipc4_fw_parse_ext_man: sof-audio-pci-intel-ptl 0000:00:1f.3: module MB_DRC: UUID 0D9F2256-8E4F-47B3-8448-239A334F1191 cfg_count: 1, bss_size: 0x1000
[ 21.045093] kernel: snd_sof:sof_ipc4_fw_parse_ext_man: sof-audio-pci-intel-ptl 0000:00:1f.3: module SRC: UUID E61BB28D-149A-4C1F-B709-46823EF5F5AE cfg_count: 23, bss_size: 0x3220
[ 21.045095] kernel: [180B blob data]
[ 21.045096] kernel: snd_sof:sof_ipc4_fw_parse_ext_man: sof-audio-pci-intel-ptl 0000:00:1f.3: module TDFB: UUID DD511749-D9FA-455C-B3A7-13585693F1AF cfg_count: 1, bss_size: 0x1000
[ 21.045098] kernel: snd_sof:sof_ipc4_fw_parse_ext_man: sof-audio-pci-intel-ptl 0000:00:1f.3: module PEAKVOL: UUID 8A171323-94A3-4E1D-AFE9-FE5DBAA4C393 cfg_count: 7, bss_size: 0x1e0
[ 21.045100] kernel: snd_sof:sof_ipc4_fw_parse_ext_man: sof-audio-pci-intel-ptl 0000:00:1f.3: module GAIN: UUID 61BCA9A8-18D0-4A18-8E7B-2639219804B7 cfg_count: 7, bss_size: 0x1a0
[ 21.045102] kernel: snd_sof:sof_ipc4_fw_parse_ext_man: sof-audio-pci-intel-ptl 0000:00:1f.3: module SMATEST: UUID 167A961E-8AE4-11EA-89F1-000C29CE1635 cfg_count: 1, bss_size: 0x1000
Collaborator
Author
|
Waiting additional day for reviews. If no objections, I'll proceed to merge tomorrow on Tuesday. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Last bits of src/audio converted to use unified CMake build rules for Zephyr builds.
Link: #8260