Skip to content

Commit 3018e2f

Browse files
NordicBuildere-rk
authored andcommitted
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]>
1 parent bb2f537 commit 3018e2f

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

samples/peripheral/radio_test/prj.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ CONFIG_SHELL=y
99

1010
CONFIG_DYNAMIC_INTERRUPTS=y
1111

12+
CONFIG_NRFX_GPPI=y
1213
CONFIG_NRFX_TIMER0=y
1314
CONFIG_CLOCK_CONTROL=y
1415

subsys/debug/cpu_load/Kconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66

77
menuconfig CPU_LOAD
88
bool "Enable CPU load measurement"
9-
select NRFX_PPI if HAS_HW_NRF_PPI
10-
select NRFX_DPPI if HAS_HW_NRF_DPPIC
9+
select NRFX_GPPI
1110
depends on !SOC_SERIES_NRF51X #Lack of required HW events
1211
help
1312
Enable the CPU load measurement instrumentation. This tool is using

tests/drivers/nrfx_integration_test/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ config NRFX_ALL_DRIVERS
1212
select NRFX_ADC if HAS_HW_NRF_ADC
1313
select NRFX_CLOCK if HAS_HW_NRF_CLOCK && !CLOCK_CONTROL_MPSL
1414
select NRFX_COMP if HAS_HW_NRF_COMP
15-
select NRFX_DPPI if HAS_HW_NRF_DPPIC
15+
select NRFX_GPPI if HAS_HW_NRF_DPPI
1616
select NRFX_EGU0 if HAS_HW_NRF_EGU0
1717
select NRFX_EGU1 if HAS_HW_NRF_EGU1
1818
select NRFX_EGU2 if HAS_HW_NRF_EGU2

west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ manifest:
6969
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
7070
- name: zephyr
7171
repo-path: sdk-zephyr
72-
revision: 9edbdaf1cc6b20e1a070b9ce20bde88a30f5c35c
72+
revision: pull/2319/head
7373
import:
7474
# In addition to the zephyr repository itself, NCS also
7575
# imports the contents of zephyr/west.yml at the above

0 commit comments

Comments
 (0)