Repository navigation
west, sof-builder, testbench: Integrate sof-topologies discovery via west - #7
Merged
Merged
Conversation
…west
Prepare `sof-utils` for standalone `west` workspaces and `sof`-managed
workspaces where `topology2` lives in `sof-topologies` rather than
`sof/tools/topology/topology2`:
- `west.yml`: Add `sof-topologies` alongside `sof` (still using
`name-allowlist: [zephyr]` to avoid circular `sof-utils` import) and
document standalone vs. `sof`-workspace update conventions.
- `sof-builder/` (`model.py`, `window.py`, `compiler.py`, `testbench.py`,
`main.py`, `README.md`): Add shared `west` and workspace-root helpers
(`west_project_path()`, `west_topdir()`,
`resolve_sof_and_workspace_roots()`, `discover_topology2_dir()`) so
`sof-builder` locates `sof-topologies/topology2`, `alsatplg`,
`sof-testbench4`, and `abi.h` (from `sof` or standalone
`sof-topologies`) without assuming `topology2_root/../../..` is `sof`.
- `sof-testbench/run_test_suite.sh`: Discover built topologies via
`west list -f "{abspath}" sof-topologies` and sibling
`sof-topologies`/`sof-topology` directories before legacy paths.
- `Makefile`, `sof-testbench/CMakeLists.txt`,
`sof-tplg-parser/CMakeLists.txt`: Remove developer-specific sibling
path fallbacks.
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
lgirdwood
force-pushed
the
feat/west-sof-topologies-discovery
branch
from
November 21, 2026 19:09
551082e to
d99e3ba
Compare
lgirdwood
marked this pull request as ready for review
November 21, 2026 20:06
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
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.
Phase 1 integration with
sofandsof-topologiesviawest:sof-topologiestowest.ymlso standalonewest init -l sof-utils && west updateworkspaces includetopology2.sof-builder(model.py,window.py,compiler.py,testbench.py,main.py,README.md) to discoversof-topologies/topology2and resolvesof/workspace_rootviawest list/west topdir/ env vars rather than assumingtopology2lives atsof/tools/topology/topology2.sof-testbench/run_test_suite.shto locate built topologies viawest list sof-topologiesand siblingsof-topologiescheckouts.Makefile,sof-testbench/CMakeLists.txt, andsof-tplg-parser/CMakeLists.txt.