Skip to content

Commit c311135

Browse files
magp-nordicmasz-nordic
magp-nordic
authored and
masz-nordic
committed
[nrf fromlist] modules: hal_nordic: align paths to BSP
Align paths after introducing BSP. Upstream PR #: 96160 Signed-off-by: Magdalena Pastula <[email protected]>
1 parent 9d15425 commit c311135

File tree

2 files changed

+24
-83
lines changed

2 files changed

+24
-83
lines changed

‎modules/hal_nordic/nrfx/CMakeLists.txt‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,35 @@ if(NOT DEFINED NRFX_DIR)
1111
set(NRFX_DIR ${ZEPHYR_CURRENT_MODULE_DIR}/nrfx CACHE PATH "nrfx Directory")
1212
endif()
1313

14+
if(NOT DEFINED CONFIG_SOC_NORDIC_BSP_NAME)
15+
message(FATAL_ERROR "CONFIG_SOC_NORDIC_BSP_NAME has to be defined.")
16+
endif()
17+
1418
set(INC_DIR ${NRFX_DIR}/drivers/include)
1519
set(SRC_DIR ${NRFX_DIR}/drivers/src)
16-
set(MDK_DIR ${NRFX_DIR}/mdk)
20+
set(BSP_DIR ${NRFX_DIR}/bsp)
1721
set(HELPERS_DIR ${NRFX_DIR}/helpers)
22+
set(SOC_DIR ${BSP_DIR}/${CONFIG_SOC_NORDIC_BSP_NAME})
23+
set(MDK_DIR ${SOC_DIR}/mdk)
24+
25+
if(NOT CONFIG_SOC_NORDIC_BSP_NAME STREQUAL "stable")
26+
zephyr_compile_definitions(NRFX_BSP_NRF_PATH="${CONFIG_SOC_NORDIC_BSP_NAME}/mdk/nrf.h")
27+
zephyr_compile_definitions(NRFX_BSP_ERRATAS_PATH="${CONFIG_SOC_NORDIC_BSP_NAME}/mdk/nrf_erratas.h")
28+
zephyr_compile_definitions(NRFX_BSP_SOC_IRQS_PATH="${CONFIG_SOC_NORDIC_BSP_NAME}/soc/nrfx_irqs.h")
29+
zephyr_compile_definitions(NRFX_BSP_NRFX_EXT_PATH="${CONFIG_SOC_NORDIC_BSP_NAME}/nrfx_ext.h")
30+
zephyr_compile_definitions(NRFX_BSP_NRFX_COREDEP_PATH="${CONFIG_SOC_NORDIC_BSP_NAME}/soc/nrfx_coredep_defs.h")
31+
endif()
1832

1933
zephyr_include_directories(${NRFX_DIR})
2034
zephyr_include_directories(${INC_DIR})
35+
zephyr_include_directories(${BSP_DIR})
36+
zephyr_include_directories(${SOC_DIR})
37+
zephyr_include_directories(${SOC_DIR}/templates)
2138
zephyr_include_directories(${MDK_DIR})
2239
zephyr_include_directories(.)
2340

41+
include(${SOC_DIR}/zephyr/nrfx.cmake OPTIONAL)
42+
2443
# Define MDK defines globally
2544
zephyr_compile_definitions_ifdef(CONFIG_SOC_SERIES_NRF51X NRF51)
2645
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF51822_QFAA NRF51422_XXAA)
@@ -197,13 +216,13 @@ zephyr_compile_definitions_ifndef(CONFIG_SOC_NRF54L_ANOMALY_56_WORKAROUND NRF54L
197216

198217
if(CONFIG_SOC_COMPATIBLE_NRF54LX AND CONFIG_NRFX_GPPI)
199218
zephyr_library_sources(${HELPERS_DIR}/nrfx_gppi_dppi_ppib_lumos.c)
200-
zephyr_library_sources(${NRFX_DIR}/soc/interconnect/dppic_ppib/nrfx_interconnect_dppic_ppib.c)
219+
zephyr_library_sources(${SOC_DIR}/soc/interconnect/dppic_ppib/nrfx_interconnect_dppic_ppib.c)
201220
endif()
202221

203222
if(CONFIG_SOC_SERIES_NRF54HX AND CONFIG_NRFX_GPPI)
204223
zephyr_library_sources(${HELPERS_DIR}/nrfx_gppi_dppi_ppib.c)
205-
zephyr_library_sources(${NRFX_DIR}/soc/interconnect/apb/nrfx_interconnect_apb.c)
206-
zephyr_library_sources(${NRFX_DIR}/soc/interconnect/ipct/nrfx_interconnect_ipct.c)
224+
zephyr_library_sources(${SOC_DIR}/soc/interconnect/apb/nrfx_interconnect_apb.c)
225+
zephyr_library_sources(${SOC_DIR}/soc/interconnect/ipct/nrfx_interconnect_ipct.c)
207226
endif()
208227

209228
# Get the SVD file for the current SoC

‎modules/hal_nordic/nrfx/nrfx_config.h‎

Lines changed: 1 addition & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -29,83 +29,5 @@
2929
#endif
3030

3131
/* Use defaults for undefined symbols. */
32-
#include <templates/nrfx_config_common.h>
33-
#if defined(NRF51)
34-
#include <templates/nrfx_config_nrf51.h>
35-
#elif defined(NRF52805_XXAA)
36-
#include <templates/nrfx_config_nrf52805.h>
37-
#elif defined(NRF52810_XXAA)
38-
#include <templates/nrfx_config_nrf52810.h>
39-
#elif defined(NRF52811_XXAA)
40-
#include <templates/nrfx_config_nrf52811.h>
41-
#elif defined(NRF52820_XXAA)
42-
#include <templates/nrfx_config_nrf52820.h>
43-
#elif defined(NRF52832_XXAA) || defined (NRF52832_XXAB)
44-
#include <templates/nrfx_config_nrf52832.h>
45-
#elif defined(NRF52833_XXAA)
46-
#include <templates/nrfx_config_nrf52833.h>
47-
#elif defined(NRF52840_XXAA)
48-
#include <templates/nrfx_config_nrf52840.h>
49-
#elif defined(NRF5340_XXAA_APPLICATION)
50-
#include <templates/nrfx_config_nrf5340_application.h>
51-
#elif defined(NRF5340_XXAA_NETWORK)
52-
#include <templates/nrfx_config_nrf5340_network.h>
53-
#elif defined(NRF54H20_XXAA) && defined(NRF_APPLICATION)
54-
#include <templates/nrfx_config_nrf54h20_application.h>
55-
#elif defined(NRF54H20_XXAA) && defined(NRF_RADIOCORE)
56-
#include <templates/nrfx_config_nrf54h20_radiocore.h>
57-
#elif defined(NRF54H20_XXAA) && defined(NRF_PPR)
58-
#include <templates/nrfx_config_nrf54h20_ppr.h>
59-
#elif defined(NRF54H20_XXAA) && defined(NRF_FLPR)
60-
#include <templates/nrfx_config_nrf54h20_flpr.h>
61-
#elif defined(NRF54H20_ENGA_XXAA) && defined(NRF_APPLICATION)
62-
#include <templates/nrfx_config_nrf54h20_enga_application.h>
63-
#elif defined(NRF54H20_ENGA_XXAA) && defined(NRF_RADIOCORE)
64-
#include <templates/nrfx_config_nrf54h20_enga_radiocore.h>
65-
#elif defined(NRF54H20_ENGA_XXAA) && defined(NRF_PPR)
66-
#include <templates/nrfx_config_nrf54h20_enga_ppr.h>
67-
#elif defined(NRF54H20_ENGA_XXAA) && defined(NRF_FLPR)
68-
#include <templates/nrfx_config_nrf54h20_enga_flpr.h>
69-
#elif defined(NRF54H20_ENGB_XXAA) && defined(NRF_APPLICATION)
70-
#include <templates/nrfx_config_nrf54h20_engb_application.h>
71-
#elif defined(NRF54H20_ENGB_XXAA) && defined(NRF_RADIOCORE)
72-
#include <templates/nrfx_config_nrf54h20_engb_radiocore.h>
73-
#elif defined(NRF54H20_ENGB_XXAA) && defined(NRF_PPR)
74-
#include <templates/nrfx_config_nrf54h20_engb_ppr.h>
75-
#elif defined(NRF54H20_ENGB_XXAA) && defined(NRF_FLPR)
76-
#include <templates/nrfx_config_nrf54h20_engb_flpr.h>
77-
#elif defined(NRF54L05_XXAA) && defined(NRF_APPLICATION)
78-
#include <templates/nrfx_config_nrf54l05_application.h>
79-
#elif defined(NRF54L05_XXAA) && defined(NRF_FLPR)
80-
#include <templates/nrfx_config_nrf54l05_flpr.h>
81-
#elif defined(NRF54L10_XXAA) && defined(NRF_APPLICATION)
82-
#include <templates/nrfx_config_nrf54l10_application.h>
83-
#elif defined(NRF54L10_XXAA) && defined(NRF_FLPR)
84-
#include <templates/nrfx_config_nrf54l10_flpr.h>
85-
#elif defined(NRF54L15_XXAA) && defined(NRF_APPLICATION)
86-
#include <templates/nrfx_config_nrf54l15_application.h>
87-
#elif defined(NRF54L15_XXAA) && defined(NRF_FLPR)
88-
#include <templates/nrfx_config_nrf54l15_flpr.h>
89-
#elif defined(NRF54LM20A_ENGA_XXAA) && defined(NRF_APPLICATION)
90-
#include <templates/nrfx_config_nrf54lm20a_enga_application.h>
91-
#elif defined(NRF54LM20A_ENGA_XXAA) && defined(NRF_FLPR)
92-
#include <templates/nrfx_config_nrf54lm20a_enga_flpr.h>
93-
#elif defined(NRF54LV10A_ENGA_XXAA) && defined(NRF_APPLICATION)
94-
#include <templates/nrfx_config_nrf54lv10a_enga_application.h>
95-
#elif defined(NRF54LV10A_ENGA_XXAA) && defined(NRF_FLPR)
96-
#include <templates/nrfx_config_nrf54lv10a_enga_flpr.h>
97-
#elif defined(NRF9120_XXAA) || defined(NRF9160_XXAA)
98-
#include <templates/nrfx_config_nrf91.h>
99-
#elif defined(NRF9230_ENGB_XXAA) && defined(NRF_APPLICATION)
100-
#include <templates/nrfx_config_nrf9230_engb_application.h>
101-
#elif defined(NRF9230_ENGB_XXAA) && defined(NRF_RADIOCORE)
102-
#include <templates/nrfx_config_nrf9230_engb_radiocore.h>
103-
#elif defined(NRF9230_ENGB_XXAA) && defined(NRF_PPR)
104-
#include <templates/nrfx_config_nrf9230_engb_ppr.h>
105-
#elif defined(NRF9230_ENGB_XXAA) && defined(NRF_FLPR)
106-
#include <templates/nrfx_config_nrf9230_engb_flpr.h>
107-
#else
108-
#include "nrfx_config_ext.h"
109-
#endif
110-
32+
#include "nrfx_templates_config.h"
11133
#endif // NRFX_CONFIG_H__

0 commit comments

Comments
 (0)