Skip to content

soc: nordic: instantiate NRF_PLATFORM_LUMOS kconfig #97474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

soc: nordic: instantiate NRF_PLATFORM_LUMOS kconfig #97474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l10_cpuapp_ns_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l15_cpuapp_ns_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion boards/ezurio/bl54l15u_dvk/bl54l15u_dvk_nrf54l15_cpuapp_ns_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_ns_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion boards/panasonic/panb611evb/panb611evb_nrf54l15_cpuapp_ns_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion boards/raytac/an54l15q_db/raytac_an54l15q_db_nrf54l15_cpuapp_ns_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion modules/hal_nordic/nrfx/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
9 changes: 9 additions & 0 deletions modules/hal_nordic/nrfx/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1303,6 +1303,15 @@ config NRFX_PRS_BOX_4
bool "PRS box 4"
select NRFX_PRS

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.

endmenu

config NRFX_RESERVED_RESOURCES_HEADER
Expand Down
7 changes: 7 additions & 0 deletions soc/nordic/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,4 +212,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
7 changes: 1 addition & 6 deletions soc/nordic/nrf54l/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -55,12 +56,6 @@ config SOC_NRF54LM20A_ENGA_CPUFLPR

if SOC_SERIES_NRF54LX

config SOC_NRF54LX_SKIP_CLOCK_CONFIG
bool "Skip clock frequency configuration in system initialization"
help
With this option, the CPU clock frequency is not set during system initialization.
The CPU runs with the default, hardware-selected frequency.

config SOC_NRF54LX_DISABLE_FICR_TRIMCNF
bool "Disable trimming of the device"
default y if TRUSTED_EXECUTION_NONSECURE
Expand Down