Skip to content

Commit

Permalink
Revert "[nrf fromlist] soc: nordic: nrf54l15: fix APPROTECT handling"
Browse files Browse the repository at this point in the history
This reverts commit e49e65b.

Revert the change until TFM is fixed.

Signed-off-by: Robert Lubos <[email protected]>
  • Loading branch information
rlubos committed Oct 29, 2024
1 parent 4c7f4d4 commit c1dc2ca
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 27 deletions.
9 changes: 3 additions & 6 deletions modules/hal_nordic/nrfx/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,11 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF9230_ENGB_CPUPPR NRF9230_ENGB_XXA
zephyr_compile_definitions_ifdef(CONFIG_NRF_APPROTECT_LOCK
ENABLE_APPROTECT)
zephyr_compile_definitions_ifdef(CONFIG_NRF_APPROTECT_USER_HANDLING
ENABLE_APPROTECT_USER_HANDLING
ENABLE_AUTHENTICATED_APPROTECT)
ENABLE_APPROTECT_USER_HANDLING)
zephyr_compile_definitions_ifdef(CONFIG_NRF_SECURE_APPROTECT_LOCK
ENABLE_SECURE_APPROTECT
ENABLE_SECUREAPPROTECT)
ENABLE_SECURE_APPROTECT)
zephyr_compile_definitions_ifdef(CONFIG_NRF_SECURE_APPROTECT_USER_HANDLING
ENABLE_SECURE_APPROTECT_USER_HANDLING
ENABLE_AUTHENTICATED_SECUREAPPROTECT)
ENABLE_SECURE_APPROTECT_USER_HANDLING)
zephyr_library_compile_definitions_ifdef(CONFIG_NRF_TRACE_PORT
ENABLE_TRACE)

Expand Down
24 changes: 3 additions & 21 deletions soc/nordic/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -98,24 +98,15 @@ config NFCT_PINS_AS_GPIOS

choice NRF_APPROTECT_HANDLING
bool "APPROTECT handling"
depends on SOC_SERIES_NRF52X || SOC_SERIES_NRF53X || SOC_NRF54L15_CPUAPP || \
SOC_SERIES_NRF91X
default NRF_APPROTECT_DISABLE if SOC_NRF54L15_CPUAPP
depends on SOC_SERIES_NRF52X || SOC_NRF5340_CPUNET || \
SOC_NRF5340_CPUAPP || SOC_SERIES_NRF91X
default NRF_APPROTECT_USE_UICR
help
Specifies how the SystemInit() function should handle the APPROTECT
mechanism.

config NRF_APPROTECT_DISABLE
bool "Disable"
depends on SOC_NRF54L15_CPUAPP
help
When this option is selected, the SystemInit() disables
the APPROTECT mechanism.

config NRF_APPROTECT_USE_UICR
bool "Use UICR"
depends on SOC_SERIES_NRF52X || SOC_SERIES_NRF53X || SOC_SERIES_NRF91X
help
When this option is selected, the SystemInit() function loads the
firmware branch state of the APPROTECT mechanism from UICR, so if
Expand All @@ -140,23 +131,14 @@ endchoice

choice NRF_SECURE_APPROTECT_HANDLING
bool "Secure APPROTECT handling"
depends on SOC_NRF5340_CPUAPP || SOC_NRF54L15_CPUAPP || SOC_SERIES_NRF91X
default NRF_SECURE_APPROTECT_DISABLE if SOC_NRF54L15_CPUAPP
depends on SOC_NRF5340_CPUAPP || SOC_SERIES_NRF91X
default NRF_SECURE_APPROTECT_USE_UICR
help
Specifies how the SystemInit() function should handle the secure
APPROTECT mechanism.

config NRF_SECURE_APPROTECT_DISABLE
bool "Disable"
depends on SOC_NRF54L15_CPUAPP
help
When this option is selected, the SystemInit() disables
the secure APPROTECT mechanism.

config NRF_SECURE_APPROTECT_USE_UICR
bool "Use UICR"
depends on SOC_NRF5340_CPUAPP || SOC_SERIES_NRF91X
help
When this option is selected, the SystemInit() function loads the
firmware branch state of the secure APPROTECT mechanism from UICR,
Expand Down

0 comments on commit c1dc2ca

Please sign in to comment.