Skip to content

changes needed for nrfx 4.0 #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 31, 2025
Merged

changes needed for nrfx 4.0 #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5358aad
[nrf fromtree] platform: nordic_nrf: Add memory service header for nR…
degjorva Oct 13, 2025
6487f84
[nrf fromtree] platform: nordic_nrf: change includes of nrf.h to nrfx.h
tomi-font Oct 23, 2025
13a08c6
[nrf fromtree] platform: nordic_nrf: do not include the MDK in nrfx_c…
tomi-font Oct 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion platform/ext/target/nordic_nrf/common/core/cmsis_drivers/Driver_Flash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <flash_layout.h>
#include <string.h>

#include <nrf.h>
#include <nrfx.h>

#ifdef __NRF_TFM__
#include <zephyr/autoconf.h>
Expand Down
2 changes: 1 addition & 1 deletion platform/ext/target/nordic_nrf/common/core/common/cmsis.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@
#ifndef __NORDIC_NRF_CMSIS_H__
#define __NORDIC_NRF_CMSIS_H__

#include <nrf.h>
#include <nrfx.h>

#endif /*__NORDIC_NRF_CMSIS_H__*/
1 change: 0 additions & 1 deletion platform/ext/target/nordic_nrf/common/core/hw_init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

#include <stdint.h>
#include <string.h>
#include <nrf.h>
#include "array.h"

#include <nrfx.h>
Expand Down
8 changes: 3 additions & 5 deletions platform/ext/target/nordic_nrf/common/core/nrfx_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,11 @@

#if RTE_FLASH0

#include <nrf.h>

#if defined(NRF_NVMC_S)
#if defined(NRF5340_XXAA_APPLICATION) || defined(NRF91_SERIES)
#define NRFX_NVMC_ENABLED 1
#elif defined(NRF_RRAMC_S)
#elif defined(NRF54L_SERIES)
#define NRFX_RRAMC_ENABLED 1
#elif defined(NRF_MRAMC_S)
#elif defined(NRF71_SERIES)
#define NRFX_MRAMC_ENABLED 1
#else
#error "Unrecognized platform"
Expand Down
2 changes: 1 addition & 1 deletion platform/ext/target/nordic_nrf/common/core/services/src/tfm_ioctl_core_ns_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* SPDX-License-Identifier: BSD-3-Clause
*/

#include "nrf.h"
#include <nrfx.h>
#include <stdint.h>
#include <tfm_platform_api.h>
#include <tfm_ioctl_core_api.h>
Expand Down
2 changes: 1 addition & 1 deletion platform/ext/target/nordic_nrf/common/core/services/src/tfm_ioctl_core_s_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/


#include "nrf.h"
#include <nrfx.h>
#include <stdint.h>
#include "tfm_platform_api.h"
#include "tfm_ioctl_core_api.h"
Expand Down
2 changes: 1 addition & 1 deletion .../target/nordic_nrf/common/nrf5340/memory_service_ranges/tfm_platform_user_memory_ranges.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <tfm_ioctl_core_api.h>

#include "nrf.h"
#include <nrfx.h>

#define FICR_BASE NRF_FICR_S_BASE

Expand Down
2 changes: 1 addition & 1 deletion ...target/nordic_nrf/common/nrf54l15/memory_service_ranges/tfm_platform_user_memory_ranges.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <tfm_ioctl_core_api.h>

#include "nrf.h"
#include <nrfx.h>


static const struct tfm_read_service_range ranges[] = {
Expand Down
7 changes: 7 additions & 0 deletions platform/ext/target/nordic_nrf/common/nrf54lm20a/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ target_include_directories(platform_s
../nrf54l
)

if(NOT NRF_DIR)
target_include_directories(platform_s
PUBLIC
memory_service_ranges
)
endif()

target_sources(platform_s
PRIVATE
${HAL_NORDIC_PATH}/nrfx/mdk/system_nrf54l.c
Expand Down
24 changes: 24 additions & 0 deletions ...rget/nordic_nrf/common/nrf54lm20a/memory_service_ranges/tfm_platform_user_memory_ranges.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/*
* Copyright (c) 2021 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: BSD-3-Clause
*/

#ifndef TFM_PLATFORM_USER_MEMORY_RANGES_H__
#define TFM_PLATFORM_USER_MEMORY_RANGES_H__

#include <tfm_ioctl_core_api.h>

#include <nrfx.h>


static const struct tfm_read_service_range ranges[] = {
{ .start = 0xFFFFFFFF, .size = 0x0},
};

static const struct tfm_write32_service_address tfm_write32_service_addresses[] = {
/* This is a dummy value because this table cannot be empty */
{.addr = 0xFFFFFFFF, .mask = 0x0, .allowed_values = NULL, .allowed_values_array_size = 0},
};

#endif /* TFM_PLATFORM_USER_MEMORY_RANGES_H__ */
7 changes: 7 additions & 0 deletions platform/ext/target/nordic_nrf/common/nrf54lv10a/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ target_include_directories(platform_s
../nrf54l
)

if(NOT NRF_DIR)
target_include_directories(platform_s
PUBLIC
memory_service_ranges
)
endif()

target_sources(platform_s
PRIVATE
${HAL_NORDIC_PATH}/nrfx/mdk/system_nrf54l.c
Expand Down
24 changes: 24 additions & 0 deletions ...rget/nordic_nrf/common/nrf54lv10a/memory_service_ranges/tfm_platform_user_memory_ranges.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/*
* Copyright (c) 2021 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: BSD-3-Clause
*/

#ifndef TFM_PLATFORM_USER_MEMORY_RANGES_H__
#define TFM_PLATFORM_USER_MEMORY_RANGES_H__

#include <tfm_ioctl_core_api.h>

#include <nrfx.h>


static const struct tfm_read_service_range ranges[] = {
{ .start = 0xFFFFFFFF, .size = 0x0},
};

static const struct tfm_write32_service_address tfm_write32_service_addresses[] = {
/* This is a dummy value because this table cannot be empty */
{.addr = 0xFFFFFFFF, .mask = 0x0, .allowed_values = NULL, .allowed_values_array_size = 0},
};

#endif /* TFM_PLATFORM_USER_MEMORY_RANGES_H__ */
2 changes: 1 addition & 1 deletion ...xt/target/nordic_nrf/common/nrf91/memory_service_ranges/tfm_platform_user_memory_ranges.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <tfm_ioctl_core_api.h>

#include "nrf.h"
#include <nrfx.h>


static const struct tfm_read_service_range ranges[] = {
Expand Down
2 changes: 1 addition & 1 deletion ...et/nordic_nrf/nrf5340dk_nrf5340_cpuapp/services/include/tfm_platform_user_memory_ranges.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <tfm_ioctl_core_api.h>

#include "nrf.h"
#include <nrfx.h>

#define FICR_BASE NRF_FICR_S_BASE

Expand Down
2 changes: 1 addition & 1 deletion .../nordic_nrf/nrf54l15dk_nrf54l10_cpuapp/services/include/tfm_platform_user_memory_ranges.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <tfm_ioctl_core_api.h>

#include "nrf.h"
#include <nrfx.h>


static const struct tfm_read_service_range ranges[] = {
Expand Down
2 changes: 1 addition & 1 deletion .../nordic_nrf/nrf54l15dk_nrf54l15_cpuapp/services/include/tfm_platform_user_memory_ranges.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <tfm_ioctl_core_api.h>

#include "nrf.h"
#include <nrfx.h>


static const struct tfm_read_service_range ranges[] = {
Expand Down
2 changes: 1 addition & 1 deletion ...rdic_nrf/nrf54lm20dk_nrf54lm20a_cpuapp/services/include/tfm_platform_user_memory_ranges.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <tfm_ioctl_core_api.h>

#include "nrf.h"
#include <nrfx.h>


static const struct tfm_read_service_range ranges[] = {
Expand Down
2 changes: 1 addition & 1 deletion ...rdic_nrf/nrf54lv10dk_nrf54lv10a_cpuapp/services/include/tfm_platform_user_memory_ranges.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <tfm_ioctl_core_api.h>

#include "nrf.h"
#include <nrfx.h>


static const struct tfm_read_service_range ranges[] = {
Expand Down
2 changes: 1 addition & 1 deletion ...t/nordic_nrf/nrf7120pdk_nrf7120_cpuapp/services/include/tfm_platform_user_memory_ranges.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <tfm_ioctl_core_api.h>

#include "nrf.h"
#include <nrfx.h>


static const struct tfm_read_service_range ranges[] = {
Expand Down
2 changes: 1 addition & 1 deletion ...xt/target/nordic_nrf/nrf9160dk_nrf9160/services/include/tfm_platform_user_memory_ranges.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <tfm_ioctl_core_api.h>

#include "nrf.h"
#include <nrfx.h>

#define FICR_BASE NRF_FICR_S_BASE

Expand Down
2 changes: 1 addition & 1 deletion ...xt/target/nordic_nrf/nrf9161dk_nrf9161/services/include/tfm_platform_user_memory_ranges.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <tfm_ioctl_core_api.h>

#include "nrf.h"
#include <nrfx.h>

#define FICR_BASE NRF_FICR_S_BASE

Expand Down