xtensa-build-zephyr: parse SOF versions from new versions.json instead of generated sof_versions.h #7661
Conversation
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
marc-hb
requested review from
aborisovich,
dbaluta,
lbetlej,
lgirdwood,
mmaka1 and
plbossart
as code owners
Collaborator
Author
|
Only one test in https://sof-ci.01.org/sofpr/PR7661/build8213/devicetest/index.html?model=MTLP_RVP_SDW&testcase=check-runtime-pm-status failed like this. This failure looks new but it can't be caused by this PR, it's unrelated: https://sof-ci.01.org/sofpr/PR7661/build8214/devicetest and everything else are all green. |
marc-hb
requested review from
LaurentiuM1234,
andyross,
kv2019i,
mengdonglin,
paulstelian97 and
softwarecki
paulstelian97
approved these changes
May 23, 2023
aiChaoSONG
reviewed
May 24, 2023
For rimage parameters, parse new, static versions.json file instead of generated sof_versions.h file. This will make possible to configure rimage before west build. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
In some cases it was difficult to separate the command's output from the extra environment it ran in. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
Zero functional change, pure clean-up. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
This makes no difference now because it has no side-effect yet but it will make a difference once it starts using `west config`. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
We used to use `-- -c rimage/config/platf.toml` for the IPC4 overlay and
the older `--tool-data rimage/config/` for the rest. This was confusing,
inconsistent and used to print this warning:
```
WARNING: --tool-data /var/home/mherber2/SOF/sof/rimage/config ignored,
overridden by: -- -c ...
```
`--tool-data` was always a bad idea. It looks generic but it's not; it
allows changing only a config directory that is always in the same
location.
Copy what `west sign` does with `--tool-data`, drop it and use `-- -c`
always.
Signed-off-by: Marc Herbert <marc.herbert@intel.com>
Unlike rimage_configuration(), rimage_options() will be kept free of side-effect. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
Zero functional change. This will allow excluding some options. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
aborisovich
approved these changes
May 24, 2023
Contributor
There was a problem hiding this comment.
OK I won't be blocking this because there are dependencies to Zephyr as @marc-hb described in the feature request. Python code looks ok. We just need to find the time to improve this solution.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
+ move some rimage-related code around to prepare for the switch to
west build(1st part of successfully tested draft TEST PR #7595)No functional change.
One of the last parts for this v2.6 requirement: