Skip to content

boards: nordic: add support for TF-m to nrf7120 #24475

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

boards: nordic: add support for TF-m to nrf7120 #24475

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e0bca2
boards: nordic: add support for TF-m to nrf7120
travis3630 Sep 10, 2025
30e0da4
try to fix NRF_SKIP_CLOCK_CONFIG to be rebase
travis3630 Oct 13, 2025
7950319
manifest: point sdk-tfm to nrf7120 tfm support
travis3630 Sep 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/trusted-firmware-m/tfm_boards/nrf7120_cpuapp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ target_include_directories(platform_s

target_sources(platform_s
PRIVATE
${ZEPHYR_NRF_MODULE_DIR}/nrf/soc/nordic/nrf71/soc.c
${ZEPHYR_NRF_MODULE_DIR}/soc/nordic/nrf71/soc.c
)

target_include_directories(platform_s
Expand Down
17 changes: 1 addition & 16 deletions soc/nordic/nrf71/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ config SOC_SERIES_NRF71X
select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
select SOC_EARLY_INIT_HOOK
select SOC_RESET_HOOK
select NRF_PLATFORM_LUMOS
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@tejlmand I have created this new Kconfig in zephyr, so that all Kconfigs between nrf71x and nrf54lx can share the common properties, also i.e. many Kconfig that has depend on (SOC_SERIES_NRF54LX || SOC_SERIES_NRF71X) can change to depend on NRF_PLATFORM_LUMOS

Copy link
Contributor

Choose a reason for hiding this comment

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

accepted.


config SOC_NRF7120_ENGA_CPUAPP
select ARM
Expand Down Expand Up @@ -48,20 +49,4 @@ config NRF_TRUSTZONE_RAM_REGION_SIZE
This abstraction allows us to configure TRUSTZONE without depending
on peripheral specific symbols.

# WZN-6148: add SOC_SERIES_NRF71 to NRF_SKIP_CLOCK_CONFIG and remove this Kconfig in the future
config SOC_NRF7120_SKIP_CLOCK_CONFIG
bool
prompt "Skip clock frequency configuration in system initialization" if TRUSTED_EXECUTION_SECURE
default y if TRUSTED_EXECUTION_NONSECURE
select NRF_SKIP_CLOCK_CONFIG
help
With this option, the CPU clock frequency is not set during this
Zephyr image's system initialization. The CPU runs with either
the HW reset values, or with the configuration set by an image
earlier in the boot chain.

Note that for security reasons it is not supported to configure
the clock peripheral (NRF_OSCILLATORS) from the non-secure
domain.

endif # SOC_SERIES_NRF71X
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ manifest:
- name: trusted-firmware-m
repo-path: sdk-trusted-firmware-m
path: modules/tee/tf-m/trusted-firmware-m
revision: b4dfb8e90f7a133a68fd6949bc24586af99a3e0c
revision: 902f58b94409fa12a57e6b821592ea53d8dfef96
Copy link
Contributor

Choose a reason for hiding this comment

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

This commit has now been polluted with other changes, please squash the commits because right now you are deleting things that are added in a previous commit which makes it confusing to review.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will fix everything when zephyrproject-rtos/zephyr#97474 ready

- name: psa-arch-tests
repo-path: sdk-psa-arch-tests
path: modules/tee/tf-m/psa-arch-tests
Expand Down
Loading