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

platform: ext: nordic_nrf: align pinctrl with v3.7-branch #110

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

gmarull
Copy link
Member

@gmarull gmarull commented Aug 19, 2024

  • Remove redundant bits
  • Align function and pin fields position/mask.

cc: @JordanYates

@joerchan
Copy link
Collaborator

@gmarull Changes here should be cherry-picks from original repository. I don't see any references to original commit.
I suggest you contact Nordics TF-M maintainer to both handle it and provide their review here.

@Vge0rge
Copy link
Collaborator

Vge0rge commented Aug 21, 2024

@joerchan is right @gmarull, you need to a PR in the upstream repo:
https://git.trustedfirmware.org/plugins/gitiles//TF-M/trusted-firmware-m.git/

And then bring the cherry pick here. There are exceptions to this rule when there is no other way but this PR doesn't seem to be one of them.

Also keep in mind that @joerchan is not working for Nordic anymore and he is not responsible for reviewing PRs here.

@Vge0rge Vge0rge self-requested a review August 21, 2024 13:14
@gmarull
Copy link
Member Author

gmarull commented Aug 26, 2024

@joerchan is right @gmarull, you need to a PR in the upstream repo: https://git.trustedfirmware.org/plugins/gitiles//TF-M/trusted-firmware-m.git/

And then bring the cherry pick here. There are exceptions to this rule when there is no other way but this PR doesn't seem to be one of them.

Also keep in mind that @joerchan is not working for Nordic anymore and he is not responsible for reviewing PRs here.

Who can take care of this? I've never contributed to TF-M directly, and I guess someone else will make this job quicker.

@Vge0rge
Copy link
Collaborator

Vge0rge commented Aug 27, 2024

I can have a look on this hopefully tomorrow.

@Vge0rge
Copy link
Collaborator

Vge0rge commented Sep 2, 2024

https://review.trustedfirmware.org/c/TF-M/trusted-firmware-m/+/30839

You can cherry pick this commit here as fromlist if you want it fast, or wait until it is merged to get it as fromtree.

@gmarull
Copy link
Member Author

gmarull commented Sep 6, 2024

@Vge0rge should be ready

@gmarull
Copy link
Member Author

gmarull commented Sep 6, 2024

It looks like stuff has been merged to main, so we may have to branch tf-m to fix v3.7 release, it depends if changes in main require changes in Zephyr as well...

@Vge0rge
Copy link
Collaborator

Vge0rge commented Sep 8, 2024

You can actually remove the fromtree completely now, we do that in our nrf fork but here in zephyr as long as you cherry pick the commit it seems good enough.

I will be out for a couple of weeks starting from Tuesday though so please advice @tomi-font on how to proceed with this.

@tomi-font
Copy link
Collaborator

It looks like we may need to branch for 3.7 because zephyrproject-rtos/zephyr#77783 just brought some upstream cherry picks in this repository to make Zephyr's TF-M compatible with the newer version of MCUboot. So merging this PR and making 3.7 point to the head of this repository won't work unless folks want to update MCUboot there as well.
@carlescufi

This should not have a functional change in TF-M but it
is done to be aligned with the Zephyr pinctrl header
in Zephyr v3.7-branch.

- Remove redundant bits
- Align function and pin fields position/mask.

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Change-Id: Id5e3fd3231992778cee2d05bc171989395aef432
(cherry picked from commit d6a6c1085acf3251d1b7f76322c2cf66c5e56a75)
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