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

Optee #2157

Merged
merged 2 commits into from
Mar 27, 2025
Merged

Optee #2157

merged 2 commits into from
Mar 27, 2025

Conversation

thochstein
Copy link
Contributor

@thochstein thochstein commented Mar 26, 2025

I built only, no runtime test. The clang patches failed to apply with the update, and I didn't know how to fix them, so I disabled them. Note that clang is currently disabled anyway.

Copy latest support from NXP BSP LF6.6.52_2.2.0.

Note that clang is disabled in optee-os-fslc.inc, which is copied from
meta-arm optee-os.inc.

Fixes: Issue 2048 - Upgrade BSP to LF6.6.52_2.2.0
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Copy link
Member

@angolini angolini left a comment

Choose a reason for hiding this comment

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

I don't have what to comment on this

Copy link
Contributor

@kraj kraj left a comment

Choose a reason for hiding this comment

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

meta-arm does not disable clang see

https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee.inc#n19

it only enables it if meta-clang is part of bblayers and TOOLCHAIN is set which by default is clang but user can set it to clang as well. I think you should reword this and also I see here you are explicitly setting TOOLCHAIN to gcc. It would be good to explain why do we need that while upstream from meta-arm does not.

@thochstein
Copy link
Contributor Author

thochstein commented Mar 26, 2025

meta-arm does not disable clang see

The release that I'm upstreaming here was tested with an older version of meta-arm where clang is disabled.

https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee.inc?h=styhead&id=fa05df1611e8038e2529c8d41bdfd308e670488c#n17

@kraj
Copy link
Contributor

kraj commented Mar 26, 2025

meta-arm does not disable clang see

The release that I'm upstreaming here was tested with an older version of meta-arm where clang is disabled.

https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee.inc?h=styhead&id=fa05df1611e8038e2529c8d41bdfd308e670488c#n17

this is for master branch where we are not using clang-18 anymore but we are on clang-20, so I would think it
works fine with this release. So here is the deal, lets delete the clang patches because I think they may not be
needed anymore. But do not disable clang like it is in this patchset.

I can help to fix if there is anything there to fix.

Clang is on version 20 now, so the disablement of it and the patches for
it are no longer needed.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Copy link
Contributor

@kraj kraj left a comment

Choose a reason for hiding this comment

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

look ok

@otavio otavio merged commit 847f19f into Freescale:master Mar 27, 2025
@otavio otavio mentioned this pull request Mar 27, 2025
29 tasks
@thochstein thochstein deleted the optee branch March 27, 2025 19:00
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.

4 participants