tools: stop copying v2 topologies to the v1 directory#5716
Merged
lgirdwood merged 2 commits intothesofproject:mainfrom Apr 25, 2022
Merged
tools: stop copying v2 topologies to the v1 directory#5716lgirdwood merged 2 commits intothesofproject:mainfrom
lgirdwood merged 2 commits intothesofproject:mainfrom
Conversation
See thesofproject#4611 for more background. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
STOP copying all files from dir: sof/tools/build_tools/topology/topology2/cavs/ to dir: sof/tools/build_tools/topology/ The original plan discussed in the reviews of commit c0bee42 ("topology: prepare for Topology2.0") and commit 308a24a ("topology2: Add build support") and more recently mentioned in thesofproject#4611 was to overwrite in place some v1 topologies with newer v2 topologies in order to "force" users to upgrade without them realizing it. This original plan is now being abandoned. v2 topologies will never overwrite v1 topologies and if ever then certainly not "en masse". Moreover, v2 topologies will be placed in a new /lib/firmware/ subdirectory. So, partial revert the aforementioned commits. More specifically. stop installing v2 topologies into the same directory as v1 topologies. Note there had never been any actual overwrite of any v1 topology yet because there had never been any v2 topology of the same name. At this point in time this gets rid of the following copies: tools/build_tools/topology: abi.conf tools/build_tools/topology: cavs-mixin-mixout-hda-2ch-cnl.conf tools/build_tools/topology: cavs-mixin-mixout-hda-2ch-cnl.tplg tools/build_tools/topology: cavs-mixin-mixout-hda-2ch-tgl.conf tools/build_tools/topology: cavs-mixin-mixout-hda-2ch-tgl.tplg tools/build_tools/topology: cavs-mixin-mixout-hda-4ch-cnl.conf tools/build_tools/topology: cavs-mixin-mixout-hda-4ch-cnl.tplg tools/build_tools/topology: cavs-mixin-mixout-hda-4ch-tgl.conf tools/build_tools/topology: cavs-mixin-mixout-hda-4ch-tgl.tplg tools/build_tools/topology: cavs-mixin-mixout-hda.conf tools/build_tools/topology: cavs-mixin-mixout-hda.tplg tools/build_tools/topology: cavs-passthrough-hdmi.conf tools/build_tools/topology: cavs-passthrough-hdmi.tplg tools/build_tools/topology: cavs-sdw.conf tools/build_tools/topology: cavs-sdw.tplg tools/build_tools/topology: cavs-tgl-nocodec.conf tools/build_tools/topology: cavs-tgl-nocodec.tplg tools/build_tools/topology: nhlt-ace-mtl-nocodec.bin tools/build_tools/topology: nhlt.bin tools/build_tools/topology: nhlt-cavs-tgl-nocodec.bin tools/build_tools/topology: sof-mtl-nocodec.conf tools/build_tools/topology: sof-mtl-nocodec.tplg From an "installer/" and sof-bin release perspective, this removes the following topology that was just added by commit ba26eef ("topology2: cavs-nocodec: Add support for MTL nocodec topology"). Installing v2 topologies into a new /lib/firmware/ subdirectory has not been implemented yet. No other change besides dropping these copies, everything else is the same. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
marc-hb
requested review from
RanderWang,
XiaoyunWu6666,
aiChaoSONG,
keqiaozhang,
lgirdwood,
macchian,
plbossart and
ranj063
Collaborator
Author
|
SOFCI TEST |
Collaborator
Author
|
Checkpatch is being silly and spellchecking a SHA1. No other checkpatch warning. https://sof-ci.01.org/sofpr/PR5716/build77/devicetest/ has one DMA trace corruption and one suspend/resume timeout - business as usual. Everything else is green. |
lgirdwood
approved these changes
Apr 22, 2022
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
2 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.
See the long and detailed commit message. See also deep buffer #4611 for more context.