manifest: Update sdk-zephyr revision (auto-manifest PR)

Automatically created by Github Action Adjusted cpu_load module Kconfig and nrfx_integration_test to enable nrfx_gppi utility explicitly. Signed-off-by: Nordic Builder <[email protected]>
nrfconnect · Dec 11, 2024 · 1513280 · 1513280
1 parent 852345e
commit 1513280
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/subsys/debug/cpu_load/Kconfig b/subsys/debug/cpu_load/Kconfig
@@ -6,8 +6,7 @@
 
 menuconfig CPU_LOAD
 	bool "Enable CPU load measurement"
-	select NRFX_PPI if HAS_HW_NRF_PPI
-	select NRFX_DPPI if HAS_HW_NRF_DPPIC
+	select NRFX_GPPI
 	depends on !SOC_SERIES_NRF51X #Lack of required HW events
 	help
 	  Enable the CPU load measurement instrumentation. This tool is using

diff --git a/tests/drivers/nrfx_integration_test/Kconfig b/tests/drivers/nrfx_integration_test/Kconfig
@@ -12,7 +12,7 @@ config NRFX_ALL_DRIVERS
 	select NRFX_ADC		if HAS_HW_NRF_ADC
 	select NRFX_CLOCK	if HAS_HW_NRF_CLOCK && !CLOCK_CONTROL_MPSL
 	select NRFX_COMP	if HAS_HW_NRF_COMP
-	select NRFX_DPPI	if HAS_HW_NRF_DPPIC
+	select NRFX_GPPI	if HAS_HW_NRF_DPPI
 	select NRFX_EGU0	if HAS_HW_NRF_EGU0
 	select NRFX_EGU1	if HAS_HW_NRF_EGU1
 	select NRFX_EGU2	if HAS_HW_NRF_EGU2

diff --git a/west.yml b/west.yml
@@ -69,7 +69,7 @@ manifest:
     # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
     - name: zephyr
       repo-path: sdk-zephyr
-      revision: a7fe5f7c4aab18312bd7f61afef55647e38f3db6
+      revision: pull/2319/head
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above