Skip to content

Commit

Permalink
[nrf fromlist] soc: nordic: nrf54l: fix APPROTECT handling
Browse files Browse the repository at this point in the history
APPROTECT symbols were already aligned to nRF54L15,
but did not take into account similar SoCs like nRF54L05 or L10.

Upstream PR #: 82478

Signed-off-by: Nikodem Kastelik <[email protected]>
  • Loading branch information
nika-nordic authored and nordicjm committed Dec 4, 2024
1 parent 33448ac commit 1c08505
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions soc/nordic/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -98,17 +98,17 @@ config NFCT_PINS_AS_GPIOS

choice NRF_APPROTECT_HANDLING
bool "APPROTECT handling"
depends on SOC_SERIES_NRF52X || SOC_SERIES_NRF53X || SOC_NRF54L15_CPUAPP || \
depends on SOC_SERIES_NRF52X || SOC_SERIES_NRF53X || SOC_NRF54L_CPUAPP_COMMON || \
SOC_SERIES_NRF91X
default NRF_APPROTECT_DISABLE if SOC_NRF54L15_CPUAPP
default NRF_APPROTECT_DISABLE if SOC_NRF54L_CPUAPP_COMMON
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
depends on SOC_NRF54L_CPUAPP_COMMON
help
When this option is selected, the SystemInit() disables
the APPROTECT mechanism.
Expand Down Expand Up @@ -140,16 +140,16 @@ 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_NRF54L_CPUAPP_COMMON || SOC_SERIES_NRF91X
default NRF_SECURE_APPROTECT_DISABLE if SOC_NRF54L_CPUAPP_COMMON
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
depends on SOC_NRF54L_CPUAPP_COMMON
help
When this option is selected, the SystemInit() disables
the secure APPROTECT mechanism.
Expand Down

0 comments on commit 1c08505

Please sign in to comment.