-
Notifications
You must be signed in to change notification settings - Fork 349
Fix topology2 builds #6592
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
Merged
Merged
Fix topology2 builds #6592
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
30121db
topology2: build the topologies in the right folder
ranj063 925da17
topology2: Remove the cavs folder
ranj063 f8bc4e4
topology2: sof-ace-tplg: Build sof-hda-generic-2ch topology
ranj063 8705e20
topology2: rename cavs-passthrough-hdmi.conf
ranj063 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| # SPDX-License-Identifier: BSD-3-Clause | ||
|
|
||
| # Array of "input-file-name;output-file-name;comma separated pre-processor variables" | ||
| set(TPLGS | ||
| # CAVS HDMI only topology with passthrough pipelines | ||
| "sof-hda-generic\;sof-hda-generic-idisp\;USE_CHAIN_DMA=true" | ||
| # CAVS HDA topology with mixer-based pipelines for HDA and passthrough pipelines for HDMI | ||
| "sof-hda-generic\;sof-hda-generic\;HDA_CONFIG=mix,USE_CHAIN_DMA=true" | ||
| # If the alsatplg plugins for NHLT are not available, the NHLT blobs will not be added to the | ||
| # topologies below. | ||
| "sof-hda-generic\;sof-hda-generic-2ch\;\ | ||
| HDA_CONFIG=mix,NUM_DMICS=2,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-2ch.bin,USE_CHAIN_DMA=true" | ||
| "sof-hda-generic\;sof-hda-generic-4ch\;\ | ||
| HDA_CONFIG=mix,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\ | ||
| PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-4ch.bin,USE_CHAIN_DMA=true" | ||
| # CAVS SDW topology with passthrough pipelines | ||
| "cavs-sdw\;cavs-sdw" | ||
|
|
||
| # CAVS SDW with SRC gain and mixer support | ||
| "cavs-sdw-src-gain-mixin\;cavs-sdw-src-gain-mixin" | ||
|
|
||
| # SDW + HDMI topology with passthrough pipelines | ||
| "cavs-sdw\;cavs-sdw-hdmi\;NUM_HDMIS=4" | ||
|
|
||
| # CAVS SSP topology for TGL | ||
| "cavs-nocodec\;sof-tgl-nocodec\;NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\ | ||
| PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-tgl-nocodec.bin" | ||
| ) | ||
|
|
||
| add_custom_target(topology2_cavs) | ||
|
|
||
| foreach(tplg ${TPLGS}) | ||
| set(defines "") | ||
| list(LENGTH tplg length) | ||
| list(GET tplg 0 input) | ||
| list(GET tplg 1 output) | ||
|
|
||
| math(EXPR last_index "${length}-1") | ||
|
|
||
| # Get the pre-processor definitions from the 3rd item in the list for each topology | ||
| # ex: "hda-generic\;hda-generic-2ch\;HDA_CONFIG=gain,DMIC_CH=2", "defines" would contain "HDA_CONFIG=gain,DMIC_CH=2" | ||
| if (${last_index} EQUAL 2) | ||
| list(GET tplg ${last_index} defines) | ||
| endif() | ||
|
|
||
| add_alsatplg2_command("${CMAKE_CURRENT_BINARY_DIR}/../abi.conf" abi_target | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/../${input}" "${output}" | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/../" "${defines}") | ||
|
|
||
| add_custom_target(topology2_avs_${output} DEPENDS ${output}.tplg) | ||
| add_dependencies(topology2_cavs topology2_avs_${output}) | ||
| endforeach() |
File renamed without changes.
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
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
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
This file was deleted.
Oops, something went wrong.
File renamed without changes.
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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| # SPDX-License-Identifier: BSD-3-Clause | ||
|
|
||
| # Array of "input-file-name;output-file-name;comma separated pre-processor variables" | ||
| set(TPLGS | ||
| # HDMI only topology with passthrough pipelines | ||
| "sof-hda-generic\;sof-hda-generic-idisp\;USE_CHAIN_DMA=true" | ||
| # HDA topology with mixer-based pipelines for HDA and passthrough pipelines for HDMI | ||
| "sof-hda-generic\;sof-hda-generic\;HDA_CONFIG=mix,USE_CHAIN_DMA=true" | ||
| # If the alsatplg plugins for NHLT are not available, the NHLT blobs will not be added to the | ||
| # topologies below. | ||
| "sof-hda-generic\;sof-hda-generic-4ch\;PLATFORM=mtl,\ | ||
| HDA_CONFIG=mix,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-4ch.bin" | ||
ranj063 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| "sof-hda-generic\;sof-hda-generic-2ch\;PLATFORM=mtl,\ | ||
| HDA_CONFIG=mix,NUM_DMICS=2,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-2ch.bin" | ||
|
|
||
| # SDW topology with passthrough pipelines | ||
| "cavs-sdw\;mtl-sdw" | ||
|
|
||
| # SDW + HDMI topology with passthrough pipelines | ||
| "cavs-sdw\;mtl-sdw-hdmi\;NUM_HDMIS=4" | ||
|
|
||
| # SDW + DMIC topology with passthrough pipelines | ||
| "cavs-sdw\;mtl-sdw-dmic\;NUM_DMICS=4,DMIC0_ID=2,DMIC1_ID=3,\ | ||
| PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-mtl-sdw-dmic.bin" | ||
|
|
||
| # SSP topology for MTL | ||
| "cavs-nocodec\;sof-mtl-nocodec\;PLATFORM=mtl,NUM_DMICS=2,\ | ||
| PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-mtl-nocodec.bin" | ||
| ) | ||
|
|
||
| add_custom_target(topology2_ace) | ||
|
|
||
| foreach(tplg ${TPLGS}) | ||
| set(defines "") | ||
| list(LENGTH tplg length) | ||
| list(GET tplg 0 input) | ||
| list(GET tplg 1 output) | ||
|
|
||
| math(EXPR last_index "${length}-1") | ||
|
|
||
| # Get the pre-processor definitions from the 3rd item in the list for each topology | ||
| # ex: "hda-generic\;hda-generic-2ch\;HDA_CONFIG=gain,DMIC_CH=2", "defines" would contain "HDA_CONFIG=gain,DMIC_CH=2" | ||
| if (${last_index} EQUAL 2) | ||
| list(GET tplg ${last_index} defines) | ||
| endif() | ||
|
|
||
| add_alsatplg2_command("${CMAKE_CURRENT_BINARY_DIR}/../abi.conf" abi_target | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/../${input}" "${output}" | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/../" "${defines}") | ||
|
|
||
| add_custom_target(topology2_ace_${output} DEPENDS ${output}.tplg) | ||
| add_dependencies(topology2_ace topology2_ace_${output}) | ||
| endforeach() | ||
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please move these new targets to their corresponding subdirectories to keep them self-contained.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fixed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would prefer each child to add itself to the parent but no big deal.