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

[nrf noup] boards: Add non secure target for nrf54L15dk #2015

Merged
merged 1 commit into from
Oct 16, 2024

Conversation

Vge0rge
Copy link
Contributor

@Vge0rge Vge0rge commented Sep 9, 2024

This adds the nrf54l15dk/nrf54l15/cpuapp/ns board variant to sdk-zephyr. It allows to build nRF54l15dk with TF-M in nRF Connect SDK.

This is done as a noup as the out-of-tree board extension feature is not available. When zephyrproject-rtos/zephyr#69548 is completed this commit can be reverted and the variant be placed in sdk-nrf.

Copy link
Contributor

@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.

Why isn't this marked as a noup?

set_property(TARGET runners_yaml_props_target PROPERTY hex_file tfm_merged.hex)
endif()

include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)

(No) thanks for the nice little trap. 😉

@tomi-font tomi-font force-pushed the nrf54l15dk_ns branch 2 times, most recently from 3be829e to ea36c10 Compare September 24, 2024 12:29
@tomi-font tomi-font self-requested a review September 24, 2024 12:29
@tomi-font tomi-font changed the title boards: Add non secure target for nrf54L15dk [nrf noup] boards: Add non secure target for nrf54L15dk Sep 24, 2024
@tomi-font
Copy link
Contributor

Can someone from the reviewer list review this PR?

@@ -98,7 +98,7 @@ to be build as multicore configuration with code snippet called ``vpr_launcher``
for the application core.

Enter the following command to compile ``hello_world`` for the FLPR core::
west build -p -b nrf54l15pdk/nrf54l15/cpuflpr --sysbuild -- -DSB_VPR_LAUNCHER=y
west build -p -b nrf54l15dk/nrf54l15/cpuflpr --sysbuild -- -DSB_VPR_LAUNCHER=y
Copy link
Contributor

Choose a reason for hiding this comment

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

This should be corrected upstream, not in this noup commit.

Copy link
Contributor

Choose a reason for hiding this comment

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

True.

@tomi-font tomi-font force-pushed the nrf54l15dk_ns branch 3 times, most recently from ee8cb0f to a3321bd Compare October 8, 2024 13:23
This adds the nrf54l15dk/nrf54l15/cpuapp/ns board variant to
sdk-zephyr. It allows to build nRF54l15dk with TF-M in nRF Connect SDK.

This is done as a noup as the out-of-tree board extension feature is
not available. When zephyrproject-rtos/zephyr#69548 is completed this
commit can be reverted and the variant be placed in sdk-nrf.

Signed-off-by: Tomi Fontanilles <[email protected]>
@rlubos rlubos merged commit 6b4c840 into nrfconnect:main Oct 16, 2024
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants