Skip to content

Commit 1f909d4

Browse files
travis3630degjorva
authored andcommitted
[nrf fromtree] soc: nordic: instantiate NRF_PLATFORM_LUMOS kconfig
Instantiate NRF_PLATFORM_LUMOS for all nrf lumos product, Add NRF_SKIP_CLOCK_CONFIG kconfig to be a general kconfig in nordic soc Kconfig, so that it can be used by other lumos product. Signed-off-by: Travis Lam <[email protected]> (cherry picked from commit 0042c1d)
1 parent e51d936 commit 1f909d4

File tree

10 files changed

+25
-14
lines changed

10 files changed

+25
-14
lines changed

boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l10_cpuapp_ns_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ CONFIG_TFM_LOG_LEVEL_SILENCE=n
3434
# from the non secure application directly. This needs to be set
3535
# otherwise nrfx will try to configure them, resulting in a bus
3636
# fault.
37-
CONFIG_SOC_NRF54LX_SKIP_CLOCK_CONFIG=y
37+
CONFIG_NRF_SKIP_CLOCK_CONFIG=y

boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l15_cpuapp_ns_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ CONFIG_TFM_LOG_LEVEL_SILENCE=n
3434
# from the non secure application directly. This needs to be set
3535
# otherwise nrfx will try to configure them, resulting in a bus
3636
# fault.
37-
CONFIG_SOC_NRF54LX_SKIP_CLOCK_CONFIG=y
37+
CONFIG_NRF_SKIP_CLOCK_CONFIG=y

boards/ezurio/bl54l15u_dvk/bl54l15u_dvk_nrf54l15_cpuapp_ns_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ CONFIG_TFM_LOG_LEVEL_SILENCE=n
3434
# from the non secure application directly. This needs to be set
3535
# otherwise nrfx will try to configure them, resulting in a bus
3636
# fault.
37-
CONFIG_SOC_NRF54LX_SKIP_CLOCK_CONFIG=y
37+
CONFIG_NRF_SKIP_CLOCK_CONFIG=y

boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_ns_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ CONFIG_TFM_LOG_LEVEL_SILENCE=n
3232
# from the non secure application directly. This needs to be set
3333
# otherwise nrfx will try to configure them, resulting in a bus
3434
# fault.
35-
CONFIG_SOC_NRF54LX_SKIP_CLOCK_CONFIG=y
35+
CONFIG_NRF_SKIP_CLOCK_CONFIG=y

boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ CONFIG_TFM_LOG_LEVEL_SILENCE=n
3232
# from the non secure application directly. This needs to be set
3333
# otherwise nrfx will try to configure them, resulting in a bus
3434
# fault.
35-
CONFIG_SOC_NRF54LX_SKIP_CLOCK_CONFIG=y
35+
CONFIG_NRF_SKIP_CLOCK_CONFIG=y

boards/panasonic/panb611evb/panb611evb_nrf54l15_cpuapp_ns_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ CONFIG_TFM_LOG_LEVEL_SILENCE=n
3333
# from the non secure application directly. This needs to be set
3434
# otherwise nrfx will try to configure them, resulting in a bus
3535
# fault.
36-
CONFIG_SOC_NRF54LX_SKIP_CLOCK_CONFIG=y
36+
CONFIG_NRF_SKIP_CLOCK_CONFIG=y

boards/raytac/an54l15q_db/raytac_an54l15q_db_nrf54l15_cpuapp_ns_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ CONFIG_TFM_LOG_LEVEL_SILENCE=n
3434
# from the non secure application directly. This needs to be set
3535
# otherwise nrfx will try to configure them, resulting in a bus
3636
# fault.
37-
CONFIG_SOC_NRF54LX_SKIP_CLOCK_CONFIG=y
37+
CONFIG_NRF_SKIP_CLOCK_CONFIG=y

modules/hal_nordic/nrfx/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ if(CONFIG_SOC_NRF54L_CPUAPP_COMMON)
190190
zephyr_compile_definitions("NRF_CONFIG_CPU_FREQ_MHZ=${clock_frequency_mhz}")
191191
endif()
192192

193-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LX_SKIP_CLOCK_CONFIG NRF_SKIP_CLOCK_CONFIGURATION)
193+
zephyr_compile_definitions_ifdef(CONFIG_NRF_SKIP_CLOCK_CONFIG NRF_SKIP_CLOCK_CONFIGURATION)
194194
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LX_DISABLE_FICR_TRIMCNF NRF_DISABLE_FICR_TRIMCNF)
195195
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LX_SKIP_GLITCHDETECTOR_DISABLE NRF_SKIP_GLITCHDETECTOR_DISABLE)
196196
zephyr_compile_definitions_ifndef(CONFIG_SOC_NRF54L_ANOMALY_56_WORKAROUND NRF54L_CONFIGURATION_56_ENABLE=0)

soc/nordic/Kconfig

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,15 @@ config NRF_SECURE_APPROTECT_USER_HANDLING
197197

198198
endchoice
199199

200+
config NRF_SKIP_CLOCK_CONFIG
201+
bool
202+
prompt "Skip clock frequency configuration" if TRUSTED_EXECUTION_SECURE
203+
depends on NRF_PLATFORM_LUMOS
204+
default y if TRUSTED_EXECUTION_NONSECURE
205+
help
206+
With this option, the CPU clock frequency is not set during system initialization.
207+
The CPU runs with the default, hardware-selected frequency.
208+
200209
config NRF_TRACE_PORT
201210
bool "nRF TPIU"
202211
depends on !SOC_SERIES_NRF51X
@@ -212,4 +221,11 @@ config NRF_PLATFORM_HALTIUM
212221
this option. This allows to easily enable common functionality on
213222
SoCs based on the Haltium platform.
214223

224+
config NRF_PLATFORM_LUMOS
225+
bool
226+
help
227+
SoC series based on the Nordic nRF Lumos platform such as nRF54Lx
228+
series. This allows to easily enable common functionality on
229+
SoCs based on the Lumos platform.
230+
215231
endif # SOC_FAMILY_NORDIC_NRF

soc/nordic/nrf54l/Kconfig

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ config SOC_SERIES_NRF54LX
88
select HAS_NRFX
99
select HAS_NORDIC_DRIVERS
1010
select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
11+
select NRF_PLATFORM_LUMOS
1112

1213
config SOC_NRF54L_CPUAPP_COMMON
1314
bool
@@ -55,12 +56,6 @@ config SOC_NRF54LM20A_ENGA_CPUFLPR
5556

5657
if SOC_SERIES_NRF54LX
5758

58-
config SOC_NRF54LX_SKIP_CLOCK_CONFIG
59-
bool "Skip clock frequency configuration in system initialization"
60-
help
61-
With this option, the CPU clock frequency is not set during system initialization.
62-
The CPU runs with the default, hardware-selected frequency.
63-
6459
config SOC_NRF54LX_DISABLE_FICR_TRIMCNF
6560
bool "Disable trimming of the device"
6661
default y if TRUSTED_EXECUTION_NONSECURE

0 commit comments

Comments
 (0)