From 92f1b3ff96901a706bc5b144281117ddab6311a5 Mon Sep 17 00:00:00 2001 From: Magdalena Pastula Date: Tue, 12 Mar 2024 17:33:59 +0100 Subject: [PATCH] modules: hal_nordic: nrfx: propagate new configs to nrfx Add support for propagating SOC_NRF54LX_DISABLE_FICR_TRIMCNF and SOC_NRF54LX_SKIP_GLITCHDETECTOR_DISABLE values to nrfx. Signed-off-by: Magdalena Pastula --- modules/hal_nordic/nrfx/CMakeLists.txt | 2 ++ soc/nordic/nrf54l/Kconfig | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt index e3850ab9346..463c4790743 100644 --- a/modules/hal_nordic/nrfx/CMakeLists.txt +++ b/modules/hal_nordic/nrfx/CMakeLists.txt @@ -156,6 +156,8 @@ if(CONFIG_SOC_NRF54L15) endif() zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LX_SKIP_CLOCK_CONFIG NRF_SKIP_CLOCK_CONFIGURATION) +zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LX_DISABLE_FICR_TRIMCNF NRF_DISABLE_FICR_TRIMCNF) +zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LX_SKIP_GLITCHDETECTOR_DISABLE NRF_SKIP_GLITCHDETECTOR_DISABLE) if(CONFIG_SOC_SERIES_NRF54LX AND CONFIG_NRFX_DPPI) zephyr_library_sources(${HELPERS_DIR}/nrfx_gppi_dppi_ppib_lumos.c) diff --git a/soc/nordic/nrf54l/Kconfig b/soc/nordic/nrf54l/Kconfig index c087a514566..640e090005d 100644 --- a/soc/nordic/nrf54l/Kconfig +++ b/soc/nordic/nrf54l/Kconfig @@ -33,12 +33,11 @@ config SOC_NRF54LX_DISABLE_FICR_TRIMCNF help Disable trimming of the device. When the device is trimmed it will copy all the trimming values from FICR into the target - addresses. When TF-M is enabled it will trim the device before - booting this image. + addresses. config SOC_NRF54LX_SKIP_GLITCHDETECTOR_DISABLE bool "Skip disabling glitch detector" - default n + default y if TRUSTED_EXECUTION_NONSECURE help With this option, the glitch detector is not disabled during system initialization. The CPU runs with the default state of glitch detector.