Skip to content

Conversation

@masz-nordic
Copy link

Align common files.

Copy link
Collaborator

@tomi-font tomi-font left a comment

Choose a reason for hiding this comment

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

Looks good, just minor comments, I will submit this commit to upstream TF-M once we have a tag for nrfx 4.0 in https://github.com/zephyrproject-rtos/hal_nordic.

@tomi-font
Copy link
Collaborator

@Vge0rge
Copy link
Contributor

Vge0rge commented Nov 17, 2025

I don't see anything problematic in the code, but we need a nightly TF-M CI run for this to be sure.

Please apply commits tags, since Tomi already opened the upstream PRs add the commit tag:
[nrf fromlist]

Ideally you can just cherry pick his commits and just apply the tag that I said, this will make it identifiable which upstream PRs the relate to.

@tomi-font
Copy link
Collaborator

now fromtrees

@tomi-font
Copy link
Collaborator

I just updated zephyrproject-rtos/trusted-firmware-m#156 so please do the same here.

masz-nordic and others added 6 commits November 26, 2025 13:59
Align common files.

Change-Id: I73509382d31476f88c20dee42fde4de6126f565d
Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
(cherry picked from commit 8ff947dd53f91cc850ee05164d9df5e377a48fbd)
…factor

Align with changes needed for nrfx 4.0.
Refactor to use nrfx layer instead of HAL.

Change-Id: Ibbffe2c2e27ea98ac08e0e23f4c33603c04fe5ea
Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
(cherry picked from commit f07f10b9c028ee1de036037264e6b1929432af1d)
nrfx_config from nrfx's templates can be used.

Change-Id: I5f532376ef0c9c73ec19b3933685a644a35a9c19
Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
Update error codes.

Change-Id: I492f82cfb777a5acfac536ae5e647ed8b7a61df3
Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
… last

Since `compiler_ext_defs.h` should define compiler symbols only
if they have not been previously defined, it should be included
as the last header to avoid redefine warnigns.
Fix in all files.

Change-Id: I010b8885b4e1b150ec527f0b246b95a4dab4902a
Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
Use nrfx 4.0 release.

Change-Id: Ic5e2faf118f2b2c673587570e32dfc49e172cb9b
Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
@masz-nordic
Copy link
Author

@tomi-font done

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