platform: nordic_nrf: add support for more UARTs

Add support for more UARTs.

Signed-off-by: Sebastian Bøe <[email protected]>
Change-Id: Iffdce1df87fd603cf76f435028896c12f1d2c276

Author: SebastianBoe

platform/ext/target/nordic_nrf/common/core/cmsis_drivers/Driver_USART.c

@@ -34,7 +34,7 @@
 
 #define ARM_USART_DRV_VERSION  ARM_DRIVER_VERSION_MAJOR_MINOR(2, 2)
 
-#if RTE_USART0 || RTE_USART1 || RTE_USART2 || RTE_USART3
+#if RTE_USART0 || RTE_USART1 || RTE_USART2 || RTE_USART3 || RTE_USART20 || RTE_USART22
 
 #define PSEL_DISCONNECTED 0xFFFFFFFFUL
 
@@ -422,4 +422,13 @@ DRIVER_USART(2);
 DRIVER_USART(3);
 #endif
 
-#endif /* RTE_USART0 || RTE_USART1 || RTE_USART2 || RTE_USART3 */
+// TODO: NCSDK-25009: Support choosing an instance for TF-M
+#if RTE_USART20
+DRIVER_USART(20);
+#endif
+
+#if RTE_USART22
+DRIVER_USART(22);
+#endif
+
+#endif /* RTE_USART0 || RTE_USART1 || etc. */

platform/ext/target/nordic_nrf/common/core/nrfx_config.h

@@ -35,10 +35,20 @@
 #include <RTE_Device.h>
 
 #if RTE_FLASH0
+
+#include <nrf.h>
+
+#if defined(NRF_NVMC_S)
 #define NRFX_NVMC_ENABLED 1
+#elif defined(NRF_RRAMC_S)
+#define NRFX_RRAMC_ENABLED 1
+#else
+#error "Unrecognized platform"
 #endif
 
-#if RTE_USART0 || RTE_USART1 || RTE_USART2 || RTE_USART3
+#endif /* RTE_FLASH0 */
+
+#if RTE_USART0 || RTE_USART1 || RTE_USART2 || RTE_USART3 || RTE_USART20 || RTE_USART22
 #define NRFX_UARTE_ENABLED 1
 #endif
 #if RTE_USART0
@@ -54,6 +64,14 @@
 #define NRFX_UARTE3_ENABLED 1
 #endif
 
+// TODO: NCSDK-25009: Moonlight: Make it possible to use different UARTS with TF-M
+#if RTE_USART20
+#define NRFX_UARTE20_ENABLED 1
+#endif
+#if RTE_USART22
+#define NRFX_UARTE22_ENABLED 1
+#endif
+
 /*
  * For chips with TrustZone support, MDK provides CMSIS-Core peripheral
  * accessing symbols in two flavors, with secure and non-secure base address
@@ -72,6 +90,8 @@
     #include <nrfx_config_nrf5340_application.h>
 #elif defined(NRF91_SERIES)
     #include <nrfx_config_nrf91.h>
+#elif defined(NRF54L15_ENGA_XXAA)
+    #include <nrfx_config_nrf54l15_application.h>
 #else
     #error "Unknown device."
 #endif

platform/ext/target/nordic_nrf/common/core/target_cfg.h

@@ -35,8 +35,21 @@
 #include "tfm_plat_defs.h"
 #include "region_defs.h"
 
+// TODO: NCSDK-25009: Support configuring which UART is used by TF-M on nrf54L
+
+#if NRF_SECURE_UART_INSTANCE == 0
+#define TFM_DRIVER_STDIO    Driver_USART0
+#elif NRF_SECURE_UART_INSTANCE == 1
 #define TFM_DRIVER_STDIO    Driver_USART1
+#elif NRF_SECURE_UART_INSTANCE == 22
+#define TFM_DRIVER_STDIO    Driver_USART22
+#endif
+
+#ifdef NRF54L15_ENGA_XXAA
+#define NS_DRIVER_STDIO     Driver_USART20
+#else
 #define NS_DRIVER_STDIO     Driver_USART0
+#endif
 
 /**
  * \brief Store the addresses of memory regions
@@ -92,6 +105,13 @@ enum tfm_plat_err_t spu_periph_init_cfg(void);
  */
 void spu_clear_irq(void);
 
+/**
+ * \brief Configures memory permissions via the MPC.
+ *
+ * \return Returns values as specified by the \ref tfm_plat_err_t
+ */
+enum tfm_plat_err_t nrf_mpc_init_cfg(void);
+
 /**
  * \brief Configures SAU and IDAU.
  */