Skip to content

Conversation

@marc-hb
Copy link
Collaborator

@marc-hb marc-hb commented May 12, 2023

No description provided.

@marc-hb marc-hb force-pushed the big-sign-switch branch 3 times, most recently from 7db9be4 to d050d2c Compare May 12, 2023 06:16
@marc-hb
Copy link
Collaborator Author

marc-hb commented May 12, 2023

https://sof-ci.01.org/sofpr/PR7595/build7542/devicetest is all red because it's missing zephyrproject-rtos/zephyr#57820 so the firmware gets signed with the wrong tgl.toml file.

https://sof-ci.01.org/sof-pr-viewer/#/build/PR7595/build11978292 has the usual timeout, hard to tell.

@marc-hb
Copy link
Collaborator Author

marc-hb commented May 12, 2023

When pointing sof/west.yml at Zephyr PR 57820, IPC4 https://sof-ci.01.org/sofpr/PR7595/build7636/devicetest/index.html is now passing!

https://sof-ci.01.org/sofpr/PR7595/build7635/devicetest/index.html is still passing and https://sof-ci.01.org/sof-pr-viewer/#/build/PR7595/build11983340 is green too and the logs show the expected changes.

marc-hb added 10 commits May 19, 2023 22:52
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>
Do not make the switch yet. Make the switch in a smaller commit that can
more easily be reverted in case of a bug or some missed dependency
somewhere.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
Update Zephyr to commit 6697c5aa0bb296 ("west: sign: rimage: drop
default -c option when the user provides one")

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
Stop invoking west sign manually. Configure rimage using `west config`
and a platform-specific WEST_CONFIG_LOCAL file instead, then rely on
west build to invoke rimage.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
@marc-hb
Copy link
Collaborator Author

marc-hb commented May 25, 2023

Superseded by 7684

@marc-hb marc-hb closed this May 25, 2023
@marc-hb marc-hb deleted the big-sign-switch branch May 25, 2023 03:24
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.

1 participant