Skip to content

Commit ea94382

Browse files
committed
[zep fromtree] platform: nordic_nrf: Add memory service header for nRF54LV10A/M20A
This is a continuation of "Add memory service header in common folder" Adds a copy of the memory_services_range to the common folder to allow Zephyr builds. A proper solution to this is planned later to avoid the duplication. Change-Id: I303c2a24caa3149883ad4ddb592b3ba1be2a61d2 Signed-off-by: Dag Erik Gjørvad <dag.erik.gjorvad@nordicsemi.no> (cherry picked from commit 2f86a3d4b4d389a5e8c7abbd70541e1718453c62)
1 parent c069da7 commit ea94382

File tree

4 files changed

+62
-0
lines changed

4 files changed

+62
-0
lines changed

platform/ext/target/nordic_nrf/common/nrf54lm20a/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@ target_include_directories(platform_s
1919
../nrf54l
2020
)
2121

22+
if(NOT NRF_DIR)
23+
target_include_directories(platform_s
24+
PUBLIC
25+
memory_service_ranges
26+
)
27+
endif()
28+
2229
target_sources(platform_s
2330
PRIVATE
2431
${HAL_NORDIC_PATH}/nrfx/mdk/system_nrf54l.c
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/*
2+
* Copyright (c) 2021 Nordic Semiconductor ASA
3+
*
4+
* SPDX-License-Identifier: BSD-3-Clause
5+
*/
6+
7+
#ifndef TFM_PLATFORM_USER_MEMORY_RANGES_H__
8+
#define TFM_PLATFORM_USER_MEMORY_RANGES_H__
9+
10+
#include <tfm_ioctl_core_api.h>
11+
12+
#include "nrf.h"
13+
14+
15+
static const struct tfm_read_service_range ranges[] = {
16+
{ .start = 0xFFFFFFFF, .size = 0x0},
17+
};
18+
19+
static const struct tfm_write32_service_address tfm_write32_service_addresses[] = {
20+
/* This is a dummy value because this table cannot be empty */
21+
{.addr = 0xFFFFFFFF, .mask = 0x0, .allowed_values = NULL, .allowed_values_array_size = 0},
22+
};
23+
24+
#endif /* TFM_PLATFORM_USER_MEMORY_RANGES_H__ */

platform/ext/target/nordic_nrf/common/nrf54lv10a/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@ target_include_directories(platform_s
1919
../nrf54l
2020
)
2121

22+
if(NOT NRF_DIR)
23+
target_include_directories(platform_s
24+
PUBLIC
25+
memory_service_ranges
26+
)
27+
endif()
28+
2229
target_sources(platform_s
2330
PRIVATE
2431
${HAL_NORDIC_PATH}/nrfx/mdk/system_nrf54l.c
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/*
2+
* Copyright (c) 2021 Nordic Semiconductor ASA
3+
*
4+
* SPDX-License-Identifier: BSD-3-Clause
5+
*/
6+
7+
#ifndef TFM_PLATFORM_USER_MEMORY_RANGES_H__
8+
#define TFM_PLATFORM_USER_MEMORY_RANGES_H__
9+
10+
#include <tfm_ioctl_core_api.h>
11+
12+
#include "nrf.h"
13+
14+
15+
static const struct tfm_read_service_range ranges[] = {
16+
{ .start = 0xFFFFFFFF, .size = 0x0},
17+
};
18+
19+
static const struct tfm_write32_service_address tfm_write32_service_addresses[] = {
20+
/* This is a dummy value because this table cannot be empty */
21+
{.addr = 0xFFFFFFFF, .mask = 0x0, .allowed_values = NULL, .allowed_values_array_size = 0},
22+
};
23+
24+
#endif /* TFM_PLATFORM_USER_MEMORY_RANGES_H__ */

0 commit comments

Comments
 (0)