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.

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

[nrf noup] platform: nordic_nrf: nRF54L15 does not have UICR #173

Merged
merged 1 commit into from
Oct 31, 2024
Merged

[nrf noup] platform: nordic_nrf: nRF54L15 does not have UICR #173

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions platform/ext/target/nordic_nrf/common/core/target_cfg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,7 @@ enum tfm_plat_err_t init_debug(void)
#error "Debug access controlled by NRF_APPROTECT and NRF_SECURE_APPROTECT."
#endif

#if defined(NRF_APPROTECT)
#if defined(NRF_APPROTECT) && !defined(NRF54L15_XXAA)
Copy link
Contributor

Choose a reason for hiding this comment

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

How about checking e.g. for NRF_UICR_S instead?

Copy link
Contributor

Choose a reason for hiding this comment

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

Or some register/define in particular under UICR (APPROTECT, SECUREAPPROTECT).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think that we should use the devices as we are using them elsewhere. This is maybe something that could be changed when we know how the nRF54L15 is going to look. We want it to lock debugger permanently, but it is not supported in 2.8.

Copy link
Contributor

Choose a reason for hiding this comment

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

though we are using defined(NRF_APPROTECT) here already 🤔

/* For nRF53 and nRF91x1 already active. For nRF9160, active in the next boot.*/
if (nrfx_nvmc_word_writable_check((uint32_t)&NRF_UICR_S->APPROTECT,
UICR_APPROTECT_PALL_Protected)) {
Expand All @@ -823,7 +823,7 @@ enum tfm_plat_err_t init_debug(void)
return TFM_PLAT_ERR_SYSTEM_ERR;
}
#endif
#if defined(NRF_SECURE_APPROTECT)
#if defined(NRF_SECURE_APPROTECT) && !defined(NRF54L15_XXAA)
/* For nRF53 and nRF91x1 already active. For nRF9160, active in the next boot. */
if (nrfx_nvmc_word_writable_check((uint32_t)&NRF_UICR_S->SECUREAPPROTECT,
UICR_SECUREAPPROTECT_PALL_Protected)) {
Expand Down