Skip to content

Commit d9c8651

Browse files
committed
modules: hal_nordic: align to BSP cleanup
No need to define includes now. Signed-off-by: Marcin Szymczyk <[email protected]>
1 parent e089ee0 commit d9c8651

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

modules/hal_nordic/nrfx/CMakeLists.txt

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,17 @@ endif()
1717

1818
set(INC_DIR ${NRFX_DIR}/drivers/include)
1919
set(SRC_DIR ${NRFX_DIR}/drivers/src)
20-
set(BSP_DIR ${NRFX_DIR}/bsp)
2120
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}/bsp.h")
27-
endif()
21+
set(BSP_DIR ${NRFX_DIR}/bsp/${CONFIG_SOC_NORDIC_BSP_NAME})
22+
set(MDK_DIR ${BSP_DIR}/mdk)
2823

2924
zephyr_include_directories(${NRFX_DIR})
3025
zephyr_include_directories(${INC_DIR})
3126
zephyr_include_directories(${BSP_DIR})
32-
zephyr_include_directories(${SOC_DIR}/templates)
27+
zephyr_include_directories(${BSP_DIR}/templates)
3328
zephyr_include_directories(.)
3429

35-
include(${SOC_DIR}/zephyr/nrfx.cmake OPTIONAL)
30+
include(${BSP_DIR}/zephyr/nrfx.cmake OPTIONAL)
3631

3732
# Define MDK defines globally
3833
zephyr_compile_definitions_ifdef(CONFIG_SOC_SERIES_NRF51X NRF51)

0 commit comments

Comments
 (0)