From 2cdb1ef75b1dafb1f894fd84c507957144317457 Mon Sep 17 00:00:00 2001 From: Nikodem Kastelik Date: Tue, 3 Dec 2024 11:33:17 +0100 Subject: [PATCH] [nrf fromlist] soc: nordic: nrf54l: fix APPROTECT handling 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 --- soc/nordic/Kconfig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/soc/nordic/Kconfig b/soc/nordic/Kconfig index f76b1d19acc..7c7a07fba4b 100644 --- a/soc/nordic/Kconfig +++ b/soc/nordic/Kconfig @@ -98,9 +98,9 @@ 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 @@ -108,7 +108,7 @@ choice NRF_APPROTECT_HANDLING 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. @@ -140,8 +140,8 @@ 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 @@ -149,7 +149,7 @@ choice NRF_SECURE_APPROTECT_HANDLING 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.