[nrf fromtree] 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 <magdalena.pastula@nordicsemi.no> (cherry picked from commit 92f1b3f)
nrfconnect · Mar 22, 2024 · 55663b1 · 55663b1
1 parent f03e194
commit 55663b1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -157,6 +157,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/arm/nordic_nrf/nrf54l/Kconfig.soc b/soc/arm/nordic_nrf/nrf54l/Kconfig.soc
@@ -37,12 +37,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.