NCS adjust

nrfconnect · Oct 21, 2024 · acf927e · acf927e
1 parent f4012b2
commit acf927e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h b/modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h
@@ -76,7 +76,7 @@
 #endif
 #endif /* CONFIG_NRF_802154_RADIO_DRIVER */
 
-#if defined(CONFIG_NRF_802154_RADIO_DRIVER) && !defined(CONFIG_NRF_802154_SL_OPENSOURCE)
+#if defined(CONFIG_MPSL)
 #include <mpsl.h>
 #define NRFX_PPI_CHANNELS_USED_BY_MPSL MPSL_RESERVED_PPI_CHANNELS
 #define NRFX_PPI_GROUPS_USED_BY_MPSL   0
@@ -85,6 +85,15 @@
 #define NRFX_PPI_GROUPS_USED_BY_MPSL   0
 #endif
 
+#if defined(CONFIG_NRFE)
+#include <nrfe_config.h>
+#define NRFX_DPPI0_CHANNELS_USED_BY_NRFE NRFE_RESERVED_PPI_CHANNELS
+#define NRFX_DPPI0_GROUPS_USED_BY_NRFE   0
+#else
+#define NRFX_DPPI0_CHANNELS_USED_BY_NRFE 0
+#define NRFX_DPPI0_GROUPS_USED_BY_NRFE   0
+#endif
+
 #ifndef NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR
 #define NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR 0
 #endif

diff --git a/modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h.jinja2 b/modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h.jinja2
@@ -76,13 +76,22 @@
 #endif
 #endif /* CONFIG_NRF_802154_RADIO_DRIVER */
 
-#if defined(CONFIG_NRF_802154_RADIO_DRIVER) && !defined(CONFIG_NRF_802154_SL_OPENSOURCE)
+#if defined(CONFIG_MPSL)
 #include <mpsl.h>
-#define NRFX_PPI_CHANNELS_USED_BY_MPSL MPSL_RESERVED_PPI_CHANNELS
-#define NRFX_PPI_GROUPS_USED_BY_MPSL   0
+#define NRFX_PPI_CHANNELS_USED_BY_MPSL   MPSL_RESERVED_PPI_CHANNELS
+#define NRFX_PPI_GROUPS_USED_BY_MPSL     0
 #else
-#define NRFX_PPI_CHANNELS_USED_BY_MPSL 0
-#define NRFX_PPI_GROUPS_USED_BY_MPSL   0
+#define NRFX_PPI_CHANNELS_USED_BY_MPSL   0
+#define NRFX_PPI_GROUPS_USED_BY_MPSL     0
+#endif
+
+#if defined(CONFIG_NRFE)
+#include <nrfe_config.h>
+#define NRFX_DPPI0_CHANNELS_USED_BY_NRFE   NRFE_RESERVED_PPI_CHANNELS
+#define NRFX_DPPI0_GROUPS_USED_BY_NRFE     0
+#else
+#define NRFX_DPPI0_CHANNELS_USED_BY_NRFE   0
+#define NRFX_DPPI0_GROUPS_USED_BY_NRFE     0
 #endif
 
 {% for dppic in dppic_inst %}