Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

topology1: remove Intel GLK/TGL/ADL/RPL topology definitions #8389

Merged

Conversation

kv2019i
Copy link
Collaborator

@kv2019i kv2019i commented Oct 25, 2023

These topologies are no longer supported by mainline firmware code for these platforms. The stable-v2.2 branch continues to support these targets with topology1. Also SOF main branch provides topology2 targets for a subset of these configurations.

@kv2019i kv2019i force-pushed the 202310-tplg1-remove-remaining-intel-targets branch from af4daeb to 50c6a3d Compare October 25, 2023 13:06
@kv2019i
Copy link
Collaborator Author

kv2019i commented Oct 25, 2023

@singalsu any thoughts what we should do with testbench. It now fails due to missing definitions:

https://github.com/thesofproject/sof/actions/runs/6640839670/job/18042051210?pr=8389

m4:test-capture.m4:9: cannot open `dmic.m4': No such file or directory
m4:test-all.m4:18: cannot open `platform/intel/bxt.m4': No such file or directory
m4:test-capture.m4:19: cannot open `platform/intel/bxt.m4': No such file or directory

@lgirdwood
Copy link
Member

@singalsu any thoughts what we should do with testbench. It now fails due to missing definitions:

https://github.com/thesofproject/sof/actions/runs/6640839670/job/18042051210?pr=8389

m4:test-capture.m4:9: cannot open `dmic.m4': No such file or directory
m4:test-all.m4:18: cannot open `platform/intel/bxt.m4': No such file or directory
m4:test-capture.m4:19: cannot open `platform/intel/bxt.m4': No such file or directory

I think testbench CI check would need to use topology2 examples. @singalsu any suggestions ?

@kv2019i
Copy link
Collaborator Author

kv2019i commented Oct 25, 2023

@singalsu @lgirdwood Or one alternative is we maintain a minimal set of Intel tplg1 m4 files to use in testbench. Then we could do some form of IPC3 debug via testbench. This would still ensure tplg patches will not be sent to wrong branches (e.g. tplg1 Intel stuff should go to stable-v2.2 now).

@marc-hb
Copy link
Collaborator

marc-hb commented Oct 25, 2023

This would still ensure tplg patches will not be sent to wrong branches (e.g. tplg1 Intel stuff should go to stable-v2.2 now).

To achieve that specific objective, trimming the CMakeLists.txt files is enough, no need to touch .m4 files. Except for people who edit code and submit changes without even compiling them first but I genuinely think these rare people would get what they deserve :-)

Copy link
Collaborator

@lyakh lyakh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@singalsu I presume this is fine with you too?

@singalsu
Copy link
Collaborator

@singalsu I presume this is fine with you too?

The test topologies build still fails. @kv2019i should remove generate of topologies those depend on dmic.m4. It's probably the shell scripts in tools/test/topology.

I've been doing to tools/topology/topology2/include/bench replacement for tplg1 topololgies for test but the work is not yet ready. ETA for ipc4 & tplg2 testbench is end of this Q.

@singalsu
Copy link
Collaborator

@kv2019i I just sent to you proposal how to fix test topologies build for scripts/host-testbench.sh usage.

@kv2019i kv2019i force-pushed the 202310-tplg1-remove-remaining-intel-targets branch from 50c6a3d to 840f4f5 Compare October 26, 2023 13:20
@kv2019i
Copy link
Collaborator Author

kv2019i commented Oct 26, 2023

V2 pushed:

  • include Seppo's change to testbench

singalsu and others added 2 commits October 26, 2023 16:22
A simplified copy of previous bxt.m4 is made as local
platform/generic.m4 with SSP and other platform definitions
for test topologies build. It is included to test-all,
test-capture, and test-playback macros definitions.

Signed-off-by: Seppo Ingalsuo <[email protected]>
These topologies are no longer supported by mainline firmware code for
these platforms. The stable-v2.2 branch continues to support these
targets with topology1. Also SOF main branch provides topology2 targets
for a subset of these configurations.

Signed-off-by: Kai Vehmanen <[email protected]>
@kv2019i kv2019i merged commit c6ba442 into thesofproject:main Oct 27, 2023
38 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants