Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Integrate nrfx 3.2.0 #12560

Merged
merged 6 commits into from
Oct 27, 2023
Merged

Integrate nrfx 3.2.0 #12560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
82ba7f2
manifest: update sdk-trusted-firmware-m revision
nika-nordic Oct 6, 2023
11c6bcb
manifest: update sdk-zephyr revision
nika-nordic Oct 6, 2023
6c23053
manifest: update mcuboot revision to disable GPIO int in GPIO driver
nika-nordic Oct 9, 2023
3040744
manifest: update connectedhomeip revision to use new nrf_power_gpregret
nika-nordic Oct 9, 2023
fa704c3
manifest: update sdk-find-my revision to use new nrf_power_gpregret
nika-nordic Oct 10, 2023
d127c97
zigbee: osif: zb_nrf_platform: align nrf_power calls to new scheme
nika-nordic Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions subsys/zigbee/osif/zb_nrf_platform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ void zb_reset(zb_uint8_t param)
* Do it manually in this case - NCP samples require this.
*/
#ifdef CONFIG_SOC_NRF5340_CPUAPP
nrf_power_gpregret_set(NRF_POWER, reas);
nrf_power_gpregret_set(NRF_POWER, 0, reas);
#endif /* CONFIG_SOC_NRF5340_CPUAPP */

/* Power on unused sections of RAM to allow MCUboot to use it. */
Expand Down Expand Up @@ -685,7 +685,7 @@ zb_uint8_t zb_get_reset_source(void)

/* Read the value at the first API call, then use data from RAM. */
if (zephyr_reset_type == 0xFF) {
zephyr_reset_type = nrf_power_gpregret_get(NRF_POWER);
zephyr_reset_type = nrf_power_gpregret_get(NRF_POWER, 0);
}
#endif /* CONFIG_ZIGBEE_LIBRARY_NCP_DEV */

Expand Down Expand Up @@ -730,7 +730,7 @@ zb_uint8_t zb_get_reset_source(void)
* SW reset, the value will not trigger NCP logic.
*/
if (zephyr_reset_type == SYS_REBOOT_NCP) {
nrf_power_gpregret_set(NRF_POWER, (uint8_t)SYS_REBOOT_COLD);
nrf_power_gpregret_set(NRF_POWER, 0, (uint8_t)SYS_REBOOT_COLD);
}
#endif /* CONFIG_ZIGBEE_LIBRARY_NCP_DEV */

Expand Down
10 changes: 5 additions & 5 deletions west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: v3.4.99-ncs1
revision: 908794942947d049b61603b728f8f15af17e4873
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down Expand Up @@ -128,7 +128,7 @@ manifest:
compare-by-default: true
- name: mcuboot
repo-path: sdk-mcuboot
revision: v1.10.99-ncs1
revision: adab597a0eb0eb9c030a7b797748a49ca89988c2
path: bootloader/mcuboot
- name: qcbor
url: https://github.com/laurencelundblade/QCBOR.git
Expand All @@ -145,11 +145,11 @@ manifest:
- name: trusted-firmware-m
repo-path: sdk-trusted-firmware-m
path: modules/tee/tf-m/trusted-firmware-m
revision: v1.8.0-ncs1
revision: 6854dd509f4252cb0f9724c4a181586abf31a12d
- name: matter
repo-path: sdk-connectedhomeip
path: modules/lib/matter
revision: 012240f5eb1bf8e5fa5affa7792c56408f95a40b
revision: 608a53eeec7271097f9875fea7f0ea8363308d41
submodules:
- name: nlio
path: third_party/nlio/repo
Expand Down Expand Up @@ -200,7 +200,7 @@ manifest:
- homekit
- name: find-my
repo-path: sdk-find-my
revision: v2.5.0
revision: b972afd32f2b6ab028320badb2e35f857b8fc158
groups:
- find-my
- name: azure-sdk-for-c
Expand Down
Loading