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

set_xtensa_param.sh: add ZEPHYR_TOOLCHAIN_VARIANT and TOOLCHAIN_VER #8578

Merged
merged 2 commits into from
Dec 13, 2023

Conversation

marc-hb
Copy link
Collaborator

@marc-hb marc-hb commented Dec 6, 2023

2 commits

It's not perfect yet but it's now more than usable for Zephyr

Rename the variable name used by SOF script with the one expected by the
Zephyr build system for simplicity and consistency.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
This helps with Zephyr and does not hurt anyone else.

Adjust rebuild-testbench.sh accordingly.

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

marc-hb commented Dec 8, 2023

Only a temporary GitHub or proxy glitch for just one platform in https://sof-ci.01.org/sof-pr-viewer/#/build/PR8578/build13228782, all other builds were successful.

Only the well-known MTL GSC firmware error in https://sof-ci.01.org/sofpr/PR8578/build755/devicetest/index.html, everything else green - even suspend/resume!

https://sof-ci.01.org/sofpr/PR8578/build756/devicetest/index.html all green - even suspend/resume!

=> small, zero functional change good to go.

*) # The previous, main case/esac already caught invalid input.
# This won't hurt platforms that don't use Zephyr (it's not even
# exported).
ZEPHYR_TOOLCHAIN_VARIANT='xcc';;
Copy link
Collaborator

Choose a reason for hiding this comment

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

what about the Zephyr toolchain?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Using the Zephyr SDK is normally achieved by NOT using this script...

@marc-hb
Copy link
Collaborator Author

marc-hb commented Dec 12, 2023

BTW this is useful for running west build / sign separately which is useful for testing the .toml modularization / pre-processing zephyrproject-rtos/zephyr#66420

@marc-hb
Copy link
Collaborator Author

marc-hb commented Dec 13, 2023

Only one unrelated and isolated proxy / git glitch in https://sof-ci.01.org/sof-pr-viewer/#/build/PR8578/build13228782, everything else green

18:22:25,852 INFO  - west update
18:22:25,984 INFO  - === updating zephyr (zephyr):
18:22:25,984 INFO  - --- zephyr: initializing
18:22:25,993 INFO  - Initialized empty Git repository in /buildagent/workspace/24733/zephyr/.git/
18:22:25,997 INFO  - --- zephyr: fetching, need revision efc32081893dd607dfc51938ef93787872008fe2
18:38:37,971 INFO  - error: RPC failed; curl 56 GnuTLS recv error (-9): Error decoding the received TLS packet.
18:38:37,971 INFO  - fatal: the remote end hung up unexpectedly
18:38:37,971 INFO  - fatal: early EOF
18:38:37,973 INFO  - fatal: index-pack failed
1

@kv2019i
Copy link
Collaborator

kv2019i commented Dec 13, 2023

The changes are to scripts not used by the failing Intel CI targets, so proceeding with merge.

@kv2019i kv2019i merged commit 3e09f23 into thesofproject:main Dec 13, 2023
41 of 43 checks passed
@marc-hb marc-hb deleted the xtensa-zephyr-sh branch December 13, 2023 22:36
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.

6 participants