platform: nordic_nrf: align to nrfx 4.0

masz-nordic · jaz1-nordic · commit 41d156ad6aed · 2025-11-12T10:39:48.000+01:00
Align common files.

Signed-off-by: Marcin Szymczyk &lt;marcin.szymczyk@nordicsemi.no&gt;
diff --git a/platform/ext/target/nordic_nrf/common/core/CMakeLists.txt b/platform/ext/target/nordic_nrf/common/core/CMakeLists.txt
@@ -82,7 +82,7 @@ target_include_directories(platform_s
         .
         native_drivers
         ${HAL_NORDIC_PATH}/nrfx
-        ${HAL_NORDIC_PATH}/nrfx/mdk
+        ${HAL_NORDIC_PATH}/nrfx/bsp/stable
         ${HAL_NORDIC_PATH}/nrfx/drivers/include
         common
         ${PLATFORM_DIR}/..
diff --git a/platform/ext/target/nordic_nrf/common/core/common/nrfx_glue.h b/platform/ext/target/nordic_nrf/common/core/common/nrfx_glue.h
@@ -35,7 +35,7 @@
 /* Include the spm utilities for the SPM_ASSERT symbol */
 #include <assert.h>
 
-#include <soc/nrfx_coredep.h>
+#include <lib/nrfx_coredep.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/platform/ext/target/nordic_nrf/common/nrf5340/CMakeLists.txt b/platform/ext/target/nordic_nrf/common/nrf5340/CMakeLists.txt
@@ -28,7 +28,7 @@ endif()
 
 target_sources(platform_s
     PRIVATE
-        ${HAL_NORDIC_PATH}/nrfx/mdk/system_nrf5340_application.c
+        ${HAL_NORDIC_PATH}/nrfx/bsp/stable/mdk/system_nrf5340_application.c
 )
 
 target_compile_definitions(platform_s
@@ -44,7 +44,7 @@ if(BL2)
 
     target_sources(platform_bl2
         PRIVATE
-            ${HAL_NORDIC_PATH}/nrfx/mdk/system_nrf5340_application.c
+            ${HAL_NORDIC_PATH}/nrfx/bsp/stable/mdk/system_nrf5340_application.c
     )
 
     target_compile_definitions(platform_bl2
diff --git a/platform/ext/target/nordic_nrf/common/nrf5340/ns/CMakeLists.txt b/platform/ext/target/nordic_nrf/common/nrf5340/ns/CMakeLists.txt
@@ -18,7 +18,7 @@ target_include_directories(platform_ns
 
 target_sources(platform_ns
     PRIVATE
-        ${HAL_NORDIC_PATH}/nrfx/mdk/system_nrf5340_application.c
+        ${HAL_NORDIC_PATH}/nrfx/bsp/stable/mdk/system_nrf5340_application.c
 )
 
 target_compile_definitions(platform_ns
diff --git a/platform/ext/target/nordic_nrf/common/nrf54l/nrf54l_init.c b/platform/ext/target/nordic_nrf/common/nrf54l/nrf54l_init.c
@@ -8,7 +8,6 @@
 #include <nrfx.h>
 #include <hal/nrf_oscillators.h>
 #include <hal/nrf_regulators.h>
-#include <nrf_erratas.h>
 
 #ifndef BIT_MASK
 /* Use Zephyr BIT_MASK for unasigned integers */
diff --git a/platform/ext/target/nordic_nrf/common/nrf54l10/CMakeLists.txt b/platform/ext/target/nordic_nrf/common/nrf54l10/CMakeLists.txt
@@ -28,7 +28,7 @@ endif()
 
 target_sources(platform_s
     PRIVATE
-        ${HAL_NORDIC_PATH}/nrfx/mdk/system_nrf54l.c
+        ${HAL_NORDIC_PATH}/nrfx/bsp/stable/mdk/system_nrf54l.c
         ../nrf54l/nrf54l_init.c
 )
 
diff --git a/platform/ext/target/nordic_nrf/common/nrf54l10/ns/CMakeLists.txt b/platform/ext/target/nordic_nrf/common/nrf54l10/ns/CMakeLists.txt
@@ -18,7 +18,7 @@ target_include_directories(platform_ns
 
 target_sources(platform_ns
     PRIVATE
-        ${HAL_NORDIC_PATH}/nrfx/mdk/system_nrf54l.c
+        ${HAL_NORDIC_PATH}/nrfx/bsp/stable/mdk/system_nrf54l.c
 )
 
 target_compile_definitions(platform_ns
diff --git a/platform/ext/target/nordic_nrf/common/nrf54l15/CMakeLists.txt b/platform/ext/target/nordic_nrf/common/nrf54l15/CMakeLists.txt
@@ -28,7 +28,7 @@ endif()
 
 target_sources(platform_s
     PRIVATE
-        ${HAL_NORDIC_PATH}/nrfx/mdk/system_nrf54l.c
+        ${HAL_NORDIC_PATH}/nrfx/bsp/stable/mdk/system_nrf54l.c
         ../nrf54l/nrf54l_init.c
 )
 
diff --git a/platform/ext/target/nordic_nrf/common/nrf54l15/ns/CMakeLists.txt b/platform/ext/target/nordic_nrf/common/nrf54l15/ns/CMakeLists.txt
@@ -18,7 +18,7 @@ target_include_directories(platform_ns
 
 target_sources(platform_ns
     PRIVATE
-        ${HAL_NORDIC_PATH}/nrfx/mdk/system_nrf54l.c
+        ${HAL_NORDIC_PATH}/nrfx/bsp/stable/mdk/system_nrf54l.c
 )
 
 target_compile_definitions(platform_ns
diff --git a/platform/ext/target/nordic_nrf/common/nrf54lm20a/CMakeLists.txt b/platform/ext/target/nordic_nrf/common/nrf54lm20a/CMakeLists.txt
@@ -28,7 +28,7 @@ endif()
 
 target_sources(platform_s
     PRIVATE
-        ${HAL_NORDIC_PATH}/nrfx/mdk/system_nrf54l.c
+        ${HAL_NORDIC_PATH}/nrfx/bsp/stable/mdk/system_nrf54l.c
         ../nrf54l/nrf54l_init.c
 )
 
diff --git a/platform/ext/target/nordic_nrf/common/nrf54lm20a/ns/CMakeLists.txt b/platform/ext/target/nordic_nrf/common/nrf54lm20a/ns/CMakeLists.txt
@@ -18,7 +18,7 @@ target_include_directories(platform_ns
 
 target_sources(platform_ns
     PRIVATE
-        ${HAL_NORDIC_PATH}/nrfx/mdk/system_nrf54l.c
+        ${HAL_NORDIC_PATH}/nrfx/bsp/stable/mdk/system_nrf54l.c
 )
 
 target_compile_definitions(platform_ns
diff --git a/platform/ext/target/nordic_nrf/common/nrf54lv10a/CMakeLists.txt b/platform/ext/target/nordic_nrf/common/nrf54lv10a/CMakeLists.txt
@@ -28,7 +28,7 @@ endif()
 
 target_sources(platform_s
     PRIVATE
-        ${HAL_NORDIC_PATH}/nrfx/mdk/system_nrf54l.c
+        ${HAL_NORDIC_PATH}/nrfx/bsp/stable/mdk/system_nrf54l.c
         ../nrf54l/nrf54l_init.c
 )
 
diff --git a/platform/ext/target/nordic_nrf/common/nrf54lv10a/ns/CMakeLists.txt b/platform/ext/target/nordic_nrf/common/nrf54lv10a/ns/CMakeLists.txt
@@ -18,7 +18,7 @@ target_include_directories(platform_ns
 
 target_sources(platform_ns
     PRIVATE
-        ${HAL_NORDIC_PATH}/nrfx/mdk/system_nrf54l.c
+        ${HAL_NORDIC_PATH}/nrfx/bsp/stable/mdk/system_nrf54l.c
 )
 
 target_compile_definitions(platform_ns
diff --git a/platform/ext/target/nordic_nrf/common/nrf7120/CMakeLists.txt b/platform/ext/target/nordic_nrf/common/nrf7120/CMakeLists.txt
@@ -20,7 +20,7 @@ target_include_directories(platform_s
 
 target_sources(platform_s
     PRIVATE
-        ${HAL_NORDIC_PATH}/nrfx/mdk/system_nrf7120_enga.c
+        ${HAL_NORDIC_PATH}/nrfx/bsp/stable/mdk/system_nrf7120_enga.c
         ./nrf71_init.c
 )
 
diff --git a/platform/ext/target/nordic_nrf/common/nrf7120/ns/CMakeLists.txt b/platform/ext/target/nordic_nrf/common/nrf7120/ns/CMakeLists.txt
@@ -18,7 +18,7 @@ target_include_directories(platform_ns
 
 target_sources(platform_ns
     PRIVATE
-        ${HAL_NORDIC_PATH}/nrfx/mdk/system_nrf7120_enga.c
+        ${HAL_NORDIC_PATH}/nrfx/bsp/stable/mdk/system_nrf7120_enga.c
 )
 
 target_compile_definitions(platform_ns
diff --git a/platform/ext/target/nordic_nrf/common/nrf91/CMakeLists.txt b/platform/ext/target/nordic_nrf/common/nrf91/CMakeLists.txt
@@ -28,7 +28,7 @@ endif()
 
 target_sources(platform_s
     PRIVATE
-        ${HAL_NORDIC_PATH}/nrfx/mdk/system_nrf91.c
+        ${HAL_NORDIC_PATH}/nrfx/bsp/stable/mdk/system_nrf91.c
 )
 
 target_compile_definitions(platform_s
@@ -46,7 +46,7 @@ if(BL2)
 
     target_sources(platform_bl2
         PRIVATE
-            ${HAL_NORDIC_PATH}/nrfx/mdk/system_nrf91.c
+            ${HAL_NORDIC_PATH}/nrfx/bsp/stable/mdk/system_nrf91.c
     )
 
     target_compile_definitions(platform_bl2
diff --git a/platform/ext/target/nordic_nrf/common/nrf91/ns/CMakeLists.txt b/platform/ext/target/nordic_nrf/common/nrf91/ns/CMakeLists.txt
@@ -21,7 +21,7 @@ target_include_directories(platform_ns
 
 target_sources(platform_ns
     PRIVATE
-        ${HAL_NORDIC_PATH}/nrfx/mdk/system_nrf91.c
+        ${HAL_NORDIC_PATH}/nrfx/bsp/stable/mdk/system_nrf91.c
 )
 
 target_compile_definitions(platform_ns

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ target_include_directories(platform_s`
`82`	`82`	`.`
`83`	`83`	`native_drivers`
`84`	`84`	`${HAL_NORDIC_PATH}/nrfx`
`85`		`- ${HAL_NORDIC_PATH}/nrfx/mdk`
	`85`	`+ ${HAL_NORDIC_PATH}/nrfx/bsp/stable`
`86`	`86`	`${HAL_NORDIC_PATH}/nrfx/drivers/include`
`87`	`87`	`common`
`88`	`88`	`${PLATFORM_DIR}/..`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ endif()`
`28`	`28`
`29`	`29`	`target_sources(platform_s`
`30`	`30`	`PRIVATE`
`31`		`- ${HAL_NORDIC_PATH}/nrfx/mdk/system_nrf5340_application.c`
	`31`	`+ ${HAL_NORDIC_PATH}/nrfx/bsp/stable/mdk/system_nrf5340_application.c`
`32`	`32`	`)`
`33`	`33`
`34`	`34`	`target_compile_definitions(platform_s`
`@@ -44,7 +44,7 @@ if(BL2)`
`44`	`44`
`45`	`45`	`target_sources(platform_bl2`
`46`	`46`	`PRIVATE`
`47`		`- ${HAL_NORDIC_PATH}/nrfx/mdk/system_nrf5340_application.c`
	`47`	`+ ${HAL_NORDIC_PATH}/nrfx/bsp/stable/mdk/system_nrf5340_application.c`
`48`	`48`	`)`
`49`	`49`
`50`	`50`	`target_compile_definitions(platform_bl2`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ target_include_directories(platform_ns`
`18`	`18`
`19`	`19`	`target_sources(platform_ns`
`20`	`20`	`PRIVATE`
`21`		`- ${HAL_NORDIC_PATH}/nrfx/mdk/system_nrf5340_application.c`
	`21`	`+ ${HAL_NORDIC_PATH}/nrfx/bsp/stable/mdk/system_nrf5340_application.c`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`target_compile_definitions(platform_ns`