nrfconnect · travis3630 · Oct 13, 2025
diff --git a/boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l10_cpuapp_ns_defconfig b/boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l10_cpuapp_ns_defconfig
@@ -34,4 +34,4 @@ CONFIG_TFM_LOG_LEVEL_SILENCE=n
 # from the non secure application directly. This needs to be set
 # otherwise nrfx will try to configure them, resulting in a bus
 # fault.
-CONFIG_SOC_NRF54LX_SKIP_CLOCK_CONFIG=y
+CONFIG_NRF_SKIP_CLOCK_CONFIG=y
diff --git a/boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l15_cpuapp_ns_defconfig b/boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l15_cpuapp_ns_defconfig
@@ -34,4 +34,4 @@ CONFIG_TFM_LOG_LEVEL_SILENCE=n
 # from the non secure application directly. This needs to be set
 # otherwise nrfx will try to configure them, resulting in a bus
 # fault.
-CONFIG_SOC_NRF54LX_SKIP_CLOCK_CONFIG=y
+CONFIG_NRF_SKIP_CLOCK_CONFIG=y
diff --git a/boards/ezurio/bl54l15u_dvk/bl54l15u_dvk_nrf54l15_cpuapp_ns_defconfig b/boards/ezurio/bl54l15u_dvk/bl54l15u_dvk_nrf54l15_cpuapp_ns_defconfig
@@ -34,4 +34,4 @@ CONFIG_TFM_LOG_LEVEL_SILENCE=n
 # from the non secure application directly. This needs to be set
 # otherwise nrfx will try to configure them, resulting in a bus
 # fault.
-CONFIG_SOC_NRF54LX_SKIP_CLOCK_CONFIG=y
+CONFIG_NRF_SKIP_CLOCK_CONFIG=y
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_ns_defconfig b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_ns_defconfig
@@ -32,4 +32,4 @@ CONFIG_TFM_LOG_LEVEL_SILENCE=n
 # from the non secure application directly. This needs to be set
 # otherwise nrfx will try to configure them, resulting in a bus
 # fault.
-CONFIG_SOC_NRF54LX_SKIP_CLOCK_CONFIG=y
+CONFIG_NRF_SKIP_CLOCK_CONFIG=y
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns_defconfig b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns_defconfig
@@ -32,4 +32,4 @@ CONFIG_TFM_LOG_LEVEL_SILENCE=n
 # from the non secure application directly. This needs to be set
 # otherwise nrfx will try to configure them, resulting in a bus
 # fault.
-CONFIG_SOC_NRF54LX_SKIP_CLOCK_CONFIG=y
+CONFIG_NRF_SKIP_CLOCK_CONFIG=y
diff --git a/boards/panasonic/panb611evb/panb611evb_nrf54l15_cpuapp_ns_defconfig b/boards/panasonic/panb611evb/panb611evb_nrf54l15_cpuapp_ns_defconfig
@@ -33,4 +33,4 @@ CONFIG_TFM_LOG_LEVEL_SILENCE=n
 # from the non secure application directly. This needs to be set
 # otherwise nrfx will try to configure them, resulting in a bus
 # fault.
-CONFIG_SOC_NRF54LX_SKIP_CLOCK_CONFIG=y
+CONFIG_NRF_SKIP_CLOCK_CONFIG=y
diff --git a/boards/raytac/an54l15q_db/raytac_an54l15q_db_nrf54l15_cpuapp_ns_defconfig b/boards/raytac/an54l15q_db/raytac_an54l15q_db_nrf54l15_cpuapp_ns_defconfig
@@ -34,4 +34,4 @@ CONFIG_TFM_LOG_LEVEL_SILENCE=n
 # from the non secure application directly. This needs to be set
 # otherwise nrfx will try to configure them, resulting in a bus
 # fault.
-CONFIG_SOC_NRF54LX_SKIP_CLOCK_CONFIG=y
+CONFIG_NRF_SKIP_CLOCK_CONFIG=y
diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -190,7 +190,7 @@ if(CONFIG_SOC_NRF54L_CPUAPP_COMMON)
 	zephyr_compile_definitions("NRF_CONFIG_CPU_FREQ_MHZ=${clock_frequency_mhz}")
 endif()
 
-zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LX_SKIP_CLOCK_CONFIG NRF_SKIP_CLOCK_CONFIGURATION)
+zephyr_compile_definitions_ifdef(CONFIG_NRF_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)
 zephyr_compile_definitions_ifndef(CONFIG_SOC_NRF54L_ANOMALY_56_WORKAROUND NRF54L_CONFIGURATION_56_ENABLE=0)

diff --git a/soc/nordic/Kconfig b/soc/nordic/Kconfig
@@ -197,6 +197,15 @@ config NRF_SECURE_APPROTECT_USER_HANDLING
 
 endchoice
 
+config NRF_SKIP_CLOCK_CONFIG
+	bool
+	prompt "Skip clock frequency configuration" if TRUSTED_EXECUTION_SECURE
+	depends on NRF_PLATFORM_LUMOS
+	default y if TRUSTED_EXECUTION_NONSECURE
+	help
+	  With this option, the CPU clock frequency is not set during system initialization.
+	  The CPU runs with the default, hardware-selected frequency.
+
 config NRF_TRACE_PORT
 	bool "nRF TPIU"
 	depends on !SOC_SERIES_NRF51X
@@ -212,4 +221,11 @@ config NRF_PLATFORM_HALTIUM
 	  this option. This allows to easily enable common functionality on
 	  SoCs based on the Haltium platform.
 
+config NRF_PLATFORM_LUMOS
+	bool
+	help
+	  SoC series based on the Nordic nRF Lumos platform need to select
+	  this option. This allows to easily enable common functionality on
+	  SoCs based on the Lumos platform.
+
 endif # SOC_FAMILY_NORDIC_NRF
diff --git a/soc/nordic/nrf54l/Kconfig b/soc/nordic/nrf54l/Kconfig
@@ -8,6 +8,7 @@ config SOC_SERIES_NRF54LX
 	select HAS_NRFX
 	select HAS_NORDIC_DRIVERS
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
+	select NRF_PLATFORM_LUMOS
 
 config SOC_NRF54L_CPUAPP_COMMON
 	bool
@@ -55,20 +56,6 @@ config SOC_NRF54LM20A_ENGA_CPUFLPR
 
 if SOC_SERIES_NRF54LX
 
-config SOC_NRF54LX_SKIP_CLOCK_CONFIG
-	bool
-	prompt "Skip clock frequency configuration in system initialization" if TRUSTED_EXECUTION_SECURE
-	default y if TRUSTED_EXECUTION_NONSECURE
-	help
-	  With this option, the CPU clock frequency is not set during this
-	  Zephyr image's system initialization. The CPU runs with either
-	  the HW reset values, or with the configuration set by an image
-	  earlier in the boot chain.
-
-	  Note that for security reasons it is not supported to configure
-	  the clock peripheral (NRF_OSCILLATORS) from the non-secure
-	  domain.
-
 config SOC_NRF54LX_DISABLE_FICR_TRIMCNF
 	bool "Disable trimming of the device"
 	default y if TRUSTED_EXECUTION_NONSECURE