[for CI only] modules: tf-m: make changes needed for nrfx 4.0

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

@@ -15,8 +15,6 @@
 
 #include <nrf-pinctrl.h>
 
-#include <nrfx.h>
-
 #define UART_PIN_INIT(node_id, prop, idx) DT_PROP_BY_IDX(node_id, prop, idx),
 
 #define RTE_USART_PINS(idx)                                                                        \
@@ -29,22 +27,24 @@
 
 #if DOMAIN_NS == 1U
 
-#ifdef NRF_UARTE0_S
+#if defined(NRF5340_XXAA_APPLICATION) || defined(NRF91_SERIES)
 
 #define RTE_USART0 1
 
-#else /* NRF_UARTE0_S - 54L15 devices*/
+#elif defined(NRF54L_SERIES)
 
 /* Only UART20 and UART30 are supported for TF-M tests, which are the
- * Non-secure applications build via the TF-M build system
+ * Non-secure applications built via the TF-M build system
  */
 #if defined(CONFIG_TFM_SECURE_UART30)
 #define RTE_USART20 1
 #else
 #define RTE_USART30 1
 #endif
 
-#endif /* NRF_UARTE0_S */
+#else
+#error Unknown platform
+#endif
 
 #endif /* DOMAIN_NS == 1U */
 

modules/trusted-firmware-m/tfm_boards/partition/region_defs.h

@@ -170,4 +170,9 @@
 #define REGION_PCD_SRAM_LIMIT       PM_PCD_SRAM_END_ADDRESS - 1
 #endif
 
+#ifdef PM_RPMSG_NRF53_SRAM_ADDRESS
+#define REGION_RPMSG_NRF53_SRAM_ADDRESS     PM_RPMSG_NRF53_SRAM_ADDRESS
+#define REGION_RPMSG_NRF53_SRAM_LIMIT       PM_RPMSG_NRF53_SRAM_END_ADDRESS - 1
+#endif
+
 #endif /* __REGION_DEFS_H__ */

scripts/quarantine.yaml

@@ -174,10 +174,6 @@
     - nrf5340dk/nrf5340/cpuapp
   comment: "https://nordicsemi.atlassian.net/browse/NRFX-8480"
 
-- platforms:
-    - .*ns
-  comment: "https://nordicsemi.atlassian.net/browse/NRFX-8563"
-
 - scenarios:
     - bluetooth.controller
   platforms:

scripts/quarantine_zephyr.yaml

@@ -587,7 +587,3 @@
     - llext.writable_relocatable_slid_linking
     - llext.writable_relocatable
   comment: "https://nordicsemi.atlassian.net/browse/NRFX-8497"
-
-- platforms:
-    - .*ns
-  comment: "https://nordicsemi.atlassian.net/browse/NRFX-8563"

west.yml

@@ -129,7 +129,7 @@ manifest:
           compare-by-default: true
     - name: mcuboot
       repo-path: sdk-mcuboot
-      revision: 40861fd7351604d38af6345e56fe7422529561e6
+      revision: pull/562/head
       path: bootloader/mcuboot
     - name: qcbor
       url: https://github.com/laurencelundblade/QCBOR
@@ -150,7 +150,7 @@ manifest:
     - name: trusted-firmware-m
       repo-path: sdk-trusted-firmware-m
       path: modules/tee/tf-m/trusted-firmware-m
-      revision: b4dfb8e90f7a133a68fd6949bc24586af99a3e0c
+      revision: pull/214/head
     - name: psa-arch-tests
       repo-path: sdk-psa-arch-tests
       path: modules/tee/tf-m/psa-arch-tests