[nrf fromlist] modules: hal_nordic: align to BSP outside of nrfx

Align sdk-zephyr to having external BSP outside of nrfx directory.

Upstream PR #:

Signed-off-by: Magdalena Pastula <[email protected]>

Author: magp-nordic

modules/hal_nordic/nrfx/CMakeLists.txt

@@ -15,19 +15,26 @@ if(NOT DEFINED CONFIG_SOC_NORDIC_BSP_NAME)
   message(FATAL_ERROR "CONFIG_SOC_NORDIC_BSP_NAME has to be defined.")
 endif()
 
+set(BSP_DIR ${NRFX_DIR}/bsp)
 set(INC_DIR ${NRFX_DIR}/drivers/include)
 set(SRC_DIR ${NRFX_DIR}/drivers/src)
-set(BSP_DIR ${NRFX_DIR}/bsp)
 set(HELPERS_DIR ${NRFX_DIR}/helpers)
-set(SOC_DIR ${BSP_DIR}/${CONFIG_SOC_NORDIC_BSP_NAME})
+
+if(CONFIG_SOC_NORDIC_BSP_NAME STREQUAL "stable")
+  set(SOC_DIR ${BSP_DIR}/${CONFIG_SOC_NORDIC_BSP_NAME})
+else()
+  string(TOUPPER ${CONFIG_SOC_NORDIC_BSP_NAME} BSP_MODULE_NAME)
+  set(SOC_DIR "${ZEPHYR_${BSP_MODULE_NAME}_MODULE_DIR}")
+endif()
+
 set(MDK_DIR ${SOC_DIR}/mdk)
 
 if(NOT CONFIG_SOC_NORDIC_BSP_NAME STREQUAL "stable")
-  zephyr_compile_definitions(NRFX_BSP_NRF_PATH="${CONFIG_SOC_NORDIC_BSP_NAME}/mdk/nrf.h")
-  zephyr_compile_definitions(NRFX_BSP_ERRATAS_PATH="${CONFIG_SOC_NORDIC_BSP_NAME}/mdk/nrf_erratas.h")
-  zephyr_compile_definitions(NRFX_BSP_SOC_IRQS_PATH="${CONFIG_SOC_NORDIC_BSP_NAME}/soc/nrfx_irqs.h")
-  zephyr_compile_definitions(NRFX_BSP_NRFX_EXT_PATH="${CONFIG_SOC_NORDIC_BSP_NAME}/nrfx_ext.h")
-  zephyr_compile_definitions(NRFX_BSP_NRFX_COREDEP_PATH="${CONFIG_SOC_NORDIC_BSP_NAME}/soc/nrfx_coredep_defs.h")
+  zephyr_compile_definitions(NRFX_BSP_NRF_PATH="mdk/nrf.h")
+  zephyr_compile_definitions(NRFX_BSP_ERRATAS_PATH="mdk/nrf_erratas.h")
+  zephyr_compile_definitions(NRFX_BSP_SOC_IRQS_PATH="soc/nrfx_irqs.h")
+  zephyr_compile_definitions(NRFX_BSP_NRFX_EXT_PATH="nrfx_ext.h")
+  zephyr_compile_definitions(NRFX_BSP_NRFX_COREDEP_PATH="soc/nrfx_coredep_defs.h")
 endif()
 
 zephyr_include_directories(${NRFX_DIR})