Skip to content

Commit 9b180f6

Browse files
tomi-fontendre-nordic
authored andcommitted
modules: tf-m: do not include MDK/nrfx in RTE_Device.h
This file gets included by nrfx_config.h in TF-M for RTE defines. With the update of nrfx to 4.0 includes of nrf.h (MDK) are replaced by nrfx.h (nrfx), so we end up in a chicken-and-egg situation where the configuration header file for nrfx includes and depends on nrfx itself. To remedy that, replace uses of MDK defines by Kconfig options and remove the header file inclusion. Signed-off-by: Tomi Fontanilles <[email protected]>
1 parent cf2ce9a commit 9b180f6

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

modules/trusted-firmware-m/tfm_boards/board/RTE_Device.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515

1616
#include <nrf-pinctrl.h>
1717

18-
#include <nrf.h>
19-
2018
#define UART_PIN_INIT(node_id, prop, idx) DT_PROP_BY_IDX(node_id, prop, idx),
2119

2220
#define RTE_USART_PINS(idx) \
@@ -29,11 +27,11 @@
2927

3028
#if DOMAIN_NS == 1U
3129

32-
#ifdef NRF_UARTE0_S
30+
#if defined(CONFIG_SOC_SERIES_NRF53X) || defined(CONFIG_SOC_SERIES_NRF91X)
3331

3432
#define RTE_USART0 1
3533

36-
#else /* NRF_UARTE0_S - 54L15 or 7120 devices*/
34+
#elif defined(CONFIG_SOC_SERIES_NRF54LX) || defined(CONFIG_SOC_SERIES_NRF71X)
3735

3836
/* UART20 and UART30 are supported for TF-M tests on NRF54LX,
3937
* while UART00 and UART30 are supported on NRF71X
@@ -46,7 +44,9 @@
4644
#define RTE_USART30 1
4745
#endif
4846

49-
#endif /* NRF_UARTE0_S */
47+
#else
48+
#error Unknown platform
49+
#endif
5050

5151
#endif /* DOMAIN_NS == 1U */
5252

0 commit comments

Comments
 (0)