Support latest nrfx HAL v4.0.0

**Note:**
  This change is backwards incompatible with the previous HAL verisons.

The latest nrfx HAL v4.0.0 has moved some folders around.
This changes align the HW models with this new folder structure.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>

Author: aescolar

52833.mk

@@ -26,7 +26,8 @@ INCLUDES:=-I${NATIVE_SIM_PATH}/common/src/include/ \
           -Isrc/nrfx_config \
           -Isrc/nrfx/nrfx_replacements \
           -I${NRFX_BASE} \
-          -I${NRFX_BASE}/mdk
+          -I${NRFX_BASE}/bsp/stable/ \
+          -I${NRFX_BASE}/bsp/stable/mdk
 
 NRF_HW_MODELS_LIB_SUFFIX?=
 LIB_NAME=libnRF_hw_models.${VARIANT}.32${NRF_HW_MODELS_LIB_SUFFIX}

5340.mk

@@ -42,7 +42,8 @@ INCLUDES:=-I${NATIVE_SIM_PATH}/common/src/include/ \
           -Isrc/nrfx_config \
           -Isrc/nrfx/nrfx_replacements \
           -I${NRFX_BASE} \
-          -I${NRFX_BASE}/mdk
+          -I${NRFX_BASE}/bsp/stable/ \
+          -I${NRFX_BASE}/bsp/stable/mdk
 
 NRF_HW_MODELS_LIB_SUFFIX?=
 LIB_NAME=libnRF_hw_models.${VARIANT}.32${NRF_HW_MODELS_LIB_SUFFIX}

54L15.mk

@@ -42,7 +42,8 @@ INCLUDES:=-I${NATIVE_SIM_PATH}/common/src/include/ \
           -Isrc/nrfx_config \
           -Isrc/nrfx/nrfx_replacements \
           -I${NRFX_BASE} \
-          -I${NRFX_BASE}/mdk \
+          -I${NRFX_BASE}/bsp/stable/ \
+          -I${NRFX_BASE}/bsp/stable/mdk \
           -I${NRFX_BASE}/drivers/include
 
 NRF_HW_MODELS_LIB_SUFFIX?=

54LM20.mk

@@ -42,7 +42,8 @@ INCLUDES:=-I${NATIVE_SIM_PATH}/common/src/include/ \
           -Isrc/nrfx_config \
           -Isrc/nrfx/nrfx_replacements \
           -I${NRFX_BASE} \
-          -I${NRFX_BASE}/mdk \
+          -I${NRFX_BASE}/bsp/stable/ \
+          -I${NRFX_BASE}/bsp/stable/mdk \
           -I${NRFX_BASE}/drivers/include
 
 NRF_HW_MODELS_LIB_SUFFIX?=

CMakeLists.txt

@@ -97,7 +97,8 @@ if(CONFIG_SOC_SERIES_BSIM_NRFXX)
     -I${CMAKE_CURRENT_SOURCE_DIR}/src/nrfx/mdk_replacements
     -I${CMAKE_CURRENT_SOURCE_DIR}/src/nrfx/nrfx_replacements
     -I${NRFX_DIR}
-    -I${NRFX_DIR}/mdk
+    -I${NRFX_DIR}/bsp/stable/
+    -I${NRFX_DIR}/bsp/stable/mdk/
     ${VARIANT_FLAGS}
     -std=gnu11 #The nrfx hal uses non standard features which will cause warnings otherwise
   )

src/HW_models/NHW_peri_types.h

@@ -16,7 +16,7 @@
 #if NHW_USE_MDK_TYPES
   #define __I /* They cannot be const from the HW models POV */
   #define __IM
-  #include "nrf.h"
+  #include "mdk/nrf.h"
 #else
 
   #if defined(NRF5340)

src/nrfx/mdk_replacements/nrf.h renamed to src/nrfx/mdk_replacements/mdk/nrf.h

@@ -12,8 +12,10 @@
 #ifndef NRF_BSIM_H__
 #define NRF_BSIM_H__
 
-/* Include the real nrf.h */
-#include <mdk/nrf.h>
+#ifdef __GNUC__
+__extension__
+#endif
+#include_next <mdk/nrf.h>
 
 #if !defined(NRF_H_NO_BSIM_REDEFS)
 /* In the HW models, peripherals registers are not mapped in the same addresses as in