Skip to content

Commit bdb5924

Browse files
mstasiaknordiccarlescufi
mstasiaknordic
authored and
carlescufi
committed
[nrf fromtree] modules: hal_nordic: move symbol definition from CMake to header
Since nrfx-based MDK now offers option to provide header with configuration symbols used within MDK, move all global definitions from CMake script to header. Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no> Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit 121962a40f8cc01eed1162a2865f2f1b3e5d1928)
1 parent c5466ee commit bdb5924

3 files changed

Lines changed: 469 additions & 136 deletions

File tree

‎modules/hal_nordic/nrfx/CMakeLists.txt‎

Lines changed: 0 additions & 135 deletions
Original file line numberDiff line numberDiff line change
@@ -27,86 +27,6 @@ zephyr_include_directories(${NRFX_DIR})
2727
zephyr_include_directories(${INC_DIR})
2828
zephyr_include_directories(.)
2929

30-
# Define MDK defines globally
31-
zephyr_compile_definitions_ifdef(CONFIG_SOC_SERIES_NRF51 NRF51)
32-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF51822_QFAA NRF51422_XXAA)
33-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF51822_QFAB NRF51422_XXAB)
34-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF51822_QFAC NRF51422_XXAC)
35-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF52805 NRF52805_XXAA)
36-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF52810 NRF52810_XXAA)
37-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF52811 NRF52811_XXAA)
38-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF52820 NRF52820_XXAA)
39-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF52832 NRF52832_XXAA)
40-
zephyr_compile_definitions_ifdef(CONFIG_SOC_COMPATIBLE_NRF52833 NRF52833_XXAA)
41-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF52840 NRF52840_XXAA)
42-
zephyr_compile_definitions_ifdef(CONFIG_SOC_COMPATIBLE_NRF5340_CPUAPP NRF5340_XXAA_APPLICATION)
43-
zephyr_compile_definitions_ifdef(CONFIG_SOC_COMPATIBLE_NRF5340_CPUNET NRF5340_XXAA_NETWORK)
44-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_CPUAPP NRF54H20_XXAA
45-
NRF_APPLICATION)
46-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_CPURAD NRF54H20_XXAA
47-
NRF_RADIOCORE)
48-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_CPUPPR NRF54H20_XXAA
49-
NRF_PPR)
50-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_CPUFLPR NRF54H20_XXAA
51-
NRF_FLPR)
52-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05 NRF54L05_XXAA)
53-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05_CPUAPP NRF_APPLICATION)
54-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05_CPUFLPR NRF_FLPR)
55-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L05_DEVELOP_IN_NRF54L15 DEVELOP_IN_NRF54L15)
56-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L10 NRF54L10_XXAA)
57-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L10_CPUAPP NRF_APPLICATION)
58-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L10_CPUFLPR NRF_FLPR)
59-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L10_DEVELOP_IN_NRF54L15 DEVELOP_IN_NRF54L15)
60-
zephyr_compile_definitions_ifdef(CONFIG_SOC_COMPATIBLE_NRF54L15 NRF54L15_XXAA)
61-
zephyr_compile_definitions_ifdef(CONFIG_SOC_COMPATIBLE_NRF54L15_CPUAPP NRF_APPLICATION)
62-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_CPUFLPR NRF_FLPR)
63-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LM20A NRF54LM20A_XXAA)
64-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LM20A_CPUAPP NRF_APPLICATION)
65-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LM20A_CPUFLPR NRF_FLPR)
66-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LM20A_DEVELOP_IN_NRF54LM20B DEVELOP_IN_NRF54LM20B)
67-
zephyr_compile_definitions_ifdef(CONFIG_SOC_COMPATIBLE_NRF54LM20A NRF54LM20A_XXAA)
68-
zephyr_compile_definitions_ifdef(CONFIG_SOC_COMPATIBLE_NRF54LM20A_CPUAPP NRF_APPLICATION)
69-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF7120_ENGA NRF7120_ENGA_XXAA)
70-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF7120_ENGA_CPUAPP NRF_APPLICATION)
71-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF7120_ENGA_CPUFLPR NRF_FLPR)
72-
zephyr_compile_definitions_ifdef(CONFIG_SOC_COMPATIBLE_NRF7120_ENGA NRF7120_ENGA_XXAA)
73-
zephyr_compile_definitions_ifdef(CONFIG_SOC_COMPATIBLE_NRF7120_ENGA_CPUAPP NRF_APPLICATION)
74-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LM20B NRF54LM20B_XXAA)
75-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LM20B_CPUAPP NRF_APPLICATION)
76-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LM20B_CPUFLPR NRF_FLPR)
77-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF9120 NRF9120_XXAA)
78-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF9160 NRF9160_XXAA)
79-
80-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF9230_ENGB_CPUAPP NRF9230_ENGB_XXAA
81-
NRF_APPLICATION)
82-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF9230_ENGB_CPURAD NRF9230_ENGB_XXAA
83-
NRF_RADIOCORE)
84-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF9230_ENGB_CPUPPR NRF9230_ENGB_XXAA
85-
NRF_PPR)
86-
87-
zephyr_compile_definitions_ifdef(CONFIG_NRF_APPROTECT_LOCK
88-
ENABLE_APPROTECT)
89-
zephyr_compile_definitions_ifdef(CONFIG_NRF_APPROTECT_USER_HANDLING
90-
ENABLE_APPROTECT_USER_HANDLING
91-
ENABLE_AUTHENTICATED_APPROTECT)
92-
zephyr_compile_definitions_ifdef(CONFIG_NRF_SECURE_APPROTECT_LOCK
93-
ENABLE_SECURE_APPROTECT
94-
ENABLE_SECUREAPPROTECT)
95-
zephyr_compile_definitions_ifdef(CONFIG_NRF_SECURE_APPROTECT_USER_HANDLING
96-
ENABLE_SECURE_APPROTECT_USER_HANDLING
97-
ENABLE_AUTHENTICATED_SECUREAPPROTECT)
98-
zephyr_library_compile_definitions_ifdef(CONFIG_NRF_TRACE_PORT
99-
ENABLE_TRACE)
100-
101-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF5340_CPUAPP
102-
NRF_SKIP_FICR_NS_COPY_TO_RAM)
103-
zephyr_compile_definitions_ifdef(CONFIG_SOC_SERIES_NRF91
104-
NRF_SKIP_FICR_NS_COPY_TO_RAM)
105-
106-
# Connect Kconfig compilation option for Non-Secure software with option required by MDK/nrfx
107-
zephyr_compile_definitions_ifdef(CONFIG_ARM_NONSECURE_FIRMWARE NRF_TRUSTZONE_NONSECURE)
108-
zephyr_compile_definitions_ifdef(CONFIG_LOG_BACKEND_SWO ENABLE_SWO)
109-
11030
if(NOT CONFIG_NRF_DONT_USE_STABLE_BSP)
11131
zephyr_library_sources_ifdef(CONFIG_SOC_SERIES_NRF51
11232
${MDK_DIR}/nrf51/system_nrf51.c)
@@ -206,61 +126,6 @@ if(CONFIG_NRFX_TWI OR CONFIG_NRFX_TWIM)
206126
zephyr_library_sources(${SRC_DIR}/nrfx_twi_twim.c)
207127
endif()
208128

209-
# Inject HAL "NFCT_PINS_AS_GPIOS" definition if user requests to
210-
# configure the NFCT pins as GPIOS. Do the same with "CONFIG_GPIO_AS_PINRESET"
211-
# to configure the reset GPIO as nRESET. This way, the HAL will take care of
212-
# doing the proper configuration sequence during system init
213-
214-
dt_nodelabel(uicr_path NODELABEL "uicr")
215-
if(DEFINED uicr_path)
216-
dt_prop(nfct_pins_as_gpios PATH ${uicr_path} PROPERTY "nfct-pins-as-gpios")
217-
dt_prop(gpio_as_nreset PATH ${uicr_path} PROPERTY "gpio-as-nreset")
218-
endif()
219-
220-
dt_nodelabel(nfct_path NODELABEL "nfct")
221-
if(DEFINED nfct_path AND NOT nfct_pins_as_gpios)
222-
dt_prop(nfct_pins_as_gpios PATH ${nfct_path} PROPERTY "nfct-pins-as-gpios")
223-
endif()
224-
225-
if(${nfct_pins_as_gpios})
226-
zephyr_library_compile_definitions(NRF_CONFIG_NFCT_PINS_AS_GPIOS)
227-
endif()
228-
229-
if(${gpio_as_nreset})
230-
zephyr_library_compile_definitions(NRF_CONFIG_GPIO_AS_PINRESET)
231-
endif()
232-
233-
dt_nodelabel(tampc_path NODELABEL "tampc")
234-
if(DEFINED tampc_path)
235-
dt_prop(swd_pins_as_gpios PATH ${tampc_path} PROPERTY "swd-pins-as-gpios")
236-
if(${swd_pins_as_gpios})
237-
zephyr_library_compile_definitions(
238-
NRF_CONFIG_SWD_PINS_AS_GPIOS
239-
)
240-
endif()
241-
endif()
242-
243-
if(CONFIG_SOC_NRF54L_CPUAPP_COMMON)
244-
# Ideally, hfpll should taken as a phandle from clocks property from cpu but it
245-
# seems that there is no such option in DT cmake functions. Assuming that nrf54l
246-
# is using hfpll as CPU clock source (true for all existing devices).
247-
dt_prop(clock_frequency PATH "/clocks/hfpll" PROPERTY "clock-frequency")
248-
math(EXPR clock_frequency_mhz "${clock_frequency} / 1000000")
249-
zephyr_compile_definitions("NRF_CONFIG_CPU_FREQ_MHZ=${clock_frequency_mhz}")
250-
endif()
251-
252-
if(CONFIG_SOC_NRF7120_ENGA_CPUAPP)
253-
dt_prop(clock_frequency PATH "/cpus/cpu@0" PROPERTY "clock-frequency")
254-
math(EXPR clock_frequency_mhz "${clock_frequency} / 1000000")
255-
zephyr_compile_definitions("NRF_CONFIG_CPU_FREQ_MHZ=${clock_frequency_mhz}")
256-
endif()
257-
258-
zephyr_compile_definitions_ifdef(CONFIG_NRF_SKIP_CLOCK_CONFIG NRF_SKIP_CLOCK_CONFIGURATION)
259-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LX_DISABLE_FICR_TRIMCNF NRF_DISABLE_FICR_TRIMCNF)
260-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LX_SKIP_TAMPC_SETUP NRF_SKIP_TAMPC_SETUP)
261-
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LX_SKIP_GLITCHDETECTOR_DISABLE NRF_SKIP_GLITCHDETECTOR_DISABLE)
262-
zephyr_compile_definitions_ifndef(CONFIG_SOC_NRF54L_ANOMALY_56_WORKAROUND NRF54L_CONFIGURATION_56_ENABLE=0)
263-
264129
if(CONFIG_SOC_SERIES_NRF54H AND CONFIG_NRFX_GPPI_V1)
265130
zephyr_library_sources(${HELPERS_DIR}/internal/nrfx_gppiv1_ipct.c)
266131
zephyr_library_sources(${HELPERS_DIR}/internal/nrfx_gppiv1_shim.c)

0 commit comments

Comments
 (0)