Batch merge 2.9.0 #19267

carlescufi · 2024-12-04T16:37:12Z

No description provided.

NordicBuilder · 2024-12-04T16:38:20Z

The following west manifest projects have changed revision in this Pull Request:

Name	Old Revision	New Revision	Diff
sidewalk	nrfconnect/sdk-sidewalk@`5308f19`	nrfconnect/sdk-sidewalk@`a2433e0` (`main`)	nrfconnect/[email protected]
zephyr	nrfconnect/sdk-zephyr@`48cdbac`	nrfconnect/sdk-zephyr@`15ffa30` (`main`)	nrfconnect/[email protected]

✅ All manifest checks OK

Note: This message is automatically posted and updated by the Manifest GitHub Action.

carlescufi · 2024-12-04T16:39:53Z

Replaces #19266

nordic-segl · 2024-12-04T16:41:14Z

tests/benchmarks/current_consumption/system_off/testcase.yaml

    platform_allow:
      - nrf52840dk/nrf52840
      - nrf52dk/nrf52832
-      - nrf5340dk/nrf5340/cpuapp


nrf5340dk was removed from the platform_allow list. Is this intentional?

I have no idea, this is cherry-picked from other PRs. Please ask the relevant contributors.

https://github.com/nrfconnect/sdk-nrf/pull/19140/files#r1869874817

@nika-nordic ping

NordicBuilder · 2024-12-04T16:55:15Z

You can find the documentation preview for this PR at this link. It will be updated about 10 minutes after the documentation build succeeds.

Note: This comment is automatically posted by the Documentation Publish GitHub Action.

NordicBuilder · 2024-12-04T16:57:38Z

CI Information

^{To view the history of this post, clich the 'edited' button above}
Build number: 3

Inputs:

Sources:

sidewalk: PR head: a2433e06b653e0f9a47f17af0fef6bd4c5e90a4e
sdk-nrf: PR head: 920fdad10c53675f4b05149d51673b240a4255a5
zephyr: PR head: 15ffa301b3294a769752ad0a1d382bce9803f265

more details

sidewalk:

PR head: a2433e06b653e0f9a47f17af0fef6bd4c5e90a4e
merge base: 5308f19c25eee01e5e2f819a3fc160131d12e33b
Diff

sdk-nrf:

PR head: 920fdad10c53675f4b05149d51673b240a4255a5
merge base: 6f444f75bb147ca695ba4f5785ca4d992caff683
target head (main): 6f444f75bb147ca695ba4f5785ca4d992caff683
Diff

zephyr:

PR head: 15ffa301b3294a769752ad0a1d382bce9803f265
merge base: 48cdbacbd7ee834f9d874be7c4c1c7dc372cedf4
Diff

Github labels

Enabled	Name	Description
	ci-disabled	Disable the ci execution
	ci-all-test	Run all of ci, no test spec filtering will be done
	ci-force-downstream	Force execution of downstream even if twister fails
	ci-run-twister	Force run twister
	ci-run-zephyr-twister	Force run zephyr twister

List of changed files detected by CI (103)

samples
│  ├── bluetooth
│  │  ├── peripheral_power_profiling
│  │  │  ├── src
│  │  │  │  │ main.c
│  ├── nfc
│  │  ├── system_off
│  │  │  ├── src
│  │  │  │  │ main.c
│  ├── wifi
│  │  ├── radio_test
│  │  │  ├── CMakeLists.txt
│  │  │  ├── Kconfig.sysbuild
│  │  │  ├── inc
│  │  │  │  │ nrf_wifi_radio_test_shell.h
│  │  │  ├── sample.yaml
│  │  │  ├── src
│  │  │  │  ├── ficr_prog.c
│  │  │  │  │ ficr_prog.h
│  │  ├── sta
│  │  │  ├── src
│  │  │  │  │ main.c
sidewalk
│  ├── doc
│  │  ├── includes
│  │  │  │ memory_requirement.txt
│  │  ├── samples
│  │  │  ├── samples_list.rst
│  │  │  │ sid_end_device.rst
│  │  ├── setting_up_sidewalk_environment
│  │  │  │ setting_up_sidewalk_prototype.rst
│  ├── lib
│  │  ├── cortex-m33
│  │  │  ├── lora_fsk
│  │  │  │  │ CMakeLists.txt
│  │  ├── cortex-m4
│  │  │  ├── lora_fsk
│  │  │  │  │ CMakeLists.txt
snippets
│  ├── nrf70-driver-verbose-debug
│  │  │ overlay-nrf70-driver-verbose-debug.conf
tests
│  ├── benchmarks
│  │  ├── current_consumption
│  │  │  ├── system_off
│  │  │  │  ├── boards
│  │  │  │  │  ├── nrf52840dk_nrf52840.overlay
│  │  │  │  │  ├── nrf52dk_nrf52832.overlay
│  │  │  │  │  ├── nrf54l15dk_nrf54l05_cpuapp.overlay
│  │  │  │  │  ├── nrf54l15dk_nrf54l10_cpuapp.overlay
│  │  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp.overlay
│  │  │  │  │ testcase.yaml
west.yml
zephyr
│  ├── CMakeLists.txt
│  ├── Kconfig.zephyr
│  ├── cmake
│  │  ├── bintools
│  │  │  ├── llvm
│  │  │  │  │ target_bintools.cmake
│  │  ├── compiler
│  │  │  ├── clang
│  │  │  │  ├── compiler_flags.cmake
│  │  │  │  │ target.cmake
│  │  │  ├── compiler_flags_template.cmake
│  │  │  ├── gcc
│  │  │  │  ├── compiler_flags.cmake
│  │  │  │  │ target.cmake
│  │  ├── linker
│  │  │  ├── armlink
│  │  │  │  ├── linker_flags.cmake
│  │  │  │  ├── linker_libraries.cmake
│  │  │  │  │ target.cmake
│  │  │  ├── ld
│  │  │  │  ├── gcc
│  │  │  │  │  │ linker_flags.cmake
│  │  │  │  ├── linker_flags.cmake
│  │  │  │  ├── linker_libraries.cmake
│  │  │  │  │ target.cmake
│  │  │  ├── linker_flags_template.cmake
│  │  │  ├── linker_libraries_template.cmake
│  │  │  ├── lld
│  │  │  │  ├── linker_flags.cmake
│  │  │  │  ├── linker_libraries.cmake
│  │  │  │  │ target.cmake
│  │  │  ├── target_template.cmake
│  │  │  ├── xt-ld
│  │  │  │  │ target.cmake
│  │  ├── modules
│  │  │  ├── FindTargetTools.cmake
│  │  │  │ extensions.cmake
│  │  ├── target_toolchain_flags.cmake
│  │  ├── toolchain
│  │  │  ├── llvm
│  │  │  │  │ generic.cmake
│  ├── drivers
│  │  ├── retained_mem
│  │  │  ├── Kconfig.nrf
│  │  │  │ retained_mem_nrf_ram_ctrl.c
│  │  ├── wifi
│  │  │  ├── nrf_wifi
│  │  │  │  ├── CMakeLists.txt
│  │  │  │  ├── Kconfig.nrfwifi
│  │  │  │  ├── src
│  │  │  │  │  ├── qspi
│  │  │  │  │  │  ├── inc
│  │  │  │  │  │  │  │ ficr_prog.h
│  │  │  │  │  │  ├── src
│  │  │  │  │  │  │  │ ficr_prog.c
│  ├── include
│  │  ├── zephyr
│  │  │  ├── drivers
│  │  │  │  ├── retained_mem
│  │  │  │  │  │ nrf_retained_mem.h
│  │  │  │  ├── wifi
│  │  │  │  │  ├── nrf_wifi
│  │  │  │  │  │  ├── bus
│  │  │  │  │  │  │  ├── qspi_if.h
│  │  │  │  │  │  │  │ rpu_hw_if.h
│  ├── lib
│  │  ├── libc
│  │  │  ├── newlib
│  │  │  │  │ CMakeLists.txt
│  │  │  ├── picolibc
│  │  │  │  │ CMakeLists.txt
│  ├── modules
│  │  ├── hal_nordic
│  │  │  ├── nrfx
│  │  │  │  │ CMakeLists.txt
│  │  ├── hostap
│  │  │  │ Kconfig
│  │  ├── nrf_wifi
│  │  │  ├── CMakeLists.txt
│  │  │  ├── Kconfig
│  │  │  ├── bus
│  │  │  │  ├── CMakeLists.txt
│  │  │  │  ├── Kconfig
│  │  │  │  ├── device.c
│  │  │  │  ├── qspi_if.c
│  │  │  │  ├── rpu_hw_if.c
│  │  │  │  ├── spi_if.c
│  │  │  │  ├── spi_if.h
│  │  │  │  │ spi_nor.h
│  │  │  ├── os
│  │  │  │  ├── CMakeLists.txt
│  │  │  │  ├── shim.c
│  │  │  │  ├── shim.h
│  │  │  │  ├── timer.c
│  │  │  │  ├── timer.h
│  │  │  │  ├── work.c
│  │  │  │  │ work.h
│  ├── samples
│  │  ├── boards
│  │  │  ├── nordic
│  │  │  │  ├── system_off
│  │  │  │  │  ├── CMakeLists.txt
│  │  │  │  │  ├── Kconfig
│  │  │  │  │  ├── README.rst
│  │  │  │  │  ├── boards
│  │  │  │  │  │  ├── nrf52840dk_nrf52840.overlay
│  │  │  │  │  │  ├── nrf52dk_nrf52832.overlay
│  │  │  │  │  │  ├── nrf54l15dk_nrf54l05_cpuapp.overlay
│  │  │  │  │  │  ├── nrf54l15dk_nrf54l10_cpuapp.overlay
│  │  │  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp.overlay
│  │  │  │  │  ├── sample.yaml
│  │  │  │  │  ├── src
│  │  │  │  │  │  ├── main.c
│  │  │  │  │  │  │ retained.c
│  │  ├── subsys
│  │  │  ├── mgmt
│  │  │  │  ├── mcumgr
│  │  │  │  │  ├── smp_svr
│  │  │  │  │  │  │ sample.yaml
│  ├── soc
│  │  ├── nordic
│  │  │  ├── common
│  │  │  │  ├── Kconfig
│  │  │  │  │ poweroff.c
│  │  │  ├── nrf52
│  │  │  │  │ Kconfig
│  │  │  ├── nrf54h
│  │  │  │  │ Kconfig
│  │  │  ├── nrf54l
│  │  │  │  │ Kconfig
│  ├── subsys
│  │  ├── bluetooth
│  │  │  ├── host
│  │  │  │  │ conn.c
│  ├── tests
│  │  ├── boards
│  │  │  ├── nrf
│  │  │  │  ├── nrf70
│  │  │  │  │  ├── bustest
│  │  │  │  │  │  ├── CMakeLists.txt
│  │  │  │  │  │  ├── Kconfig
│  │  │  │  │  │  ├── prj.conf
│  │  │  │  │  │  ├── src
│  │  │  │  │  │  │  │ main.c
│  │  │  │  │  │  │ testcase.yaml
│  │ west.yml

Outputs:

Toolchain

Version: b77d8c1312
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:b77d8c1312_912848a074

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

◻️ Toolchain - Skipped: existing toolchain is used
✅ Build twister - Skipped: Skipping Build & Test as it succeeded in a previous run: 2
✅ Integration tests
- ✅ test-sdk-audio - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test-fw-nrfconnect-boot - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test_ble_nrf_config - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test-fw-nrfconnect-ble_samples - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test-fw-nrfconnect-chip
- ✅ test-fw-nrfconnect-nfc - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test-fw-nrfconnect-nrf-iot_thingy91 - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test-fw-nrfconnect-rs - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test-fw-nrfconnect-fem - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test-fw-nrfconnect-thread - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test-sdk-find-my - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test-fw-nrfconnect-nrf-iot_mosh - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test-fw-nrfconnect-nrf-iot_positioning - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test-sdk-sidewalk - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test-sdk-wifi - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test-low-level
- ✅ test-sdk-mcuboot - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test-sdk-dfu - Skipped: Job was skipped as it succeeded in a previous run
- ⚠️ test-fw-nrfconnect-nrf-iot_cloud

Disabled integration tests

- desktop52_verification
- doc-internal
- test-fw-nrfconnect-apps
- test-fw-nrfconnect-ble_mesh
- test-fw-nrfconnect-nrf-iot_libmodem-nrf
- test-fw-nrfconnect-nrf-iot_lwm2m
- test-fw-nrfconnect-nrf-iot_nrf_provisioning
- test-fw-nrfconnect-nrf-iot_samples
- test-fw-nrfconnect-nrf-iot_serial_lte_modem
- test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
- test-fw-nrfconnect-nrf_crypto
- test-fw-nrfconnect-ps
- test-fw-nrfconnect-rpc
- test-fw-nrfconnect-tfm
- test-fw-nrfconnect-zigbee
- test-sdk-pmic-samples
- test-secdom-samples-public

Note: This message is automatically posted and updated by the CI

Point to a batch merge: nrfconnect/sdk-zephyr#2339 Signed-off-by: Carles Cufi <[email protected]>

Pull commit with libgcc linking fixes. Signed-off-by: Torsten Rasmussen <[email protected]>

Move ficr_prog.c from drivers to radio test sample as it is only used in the sample. Signed-off-by: Bansidhar P.M <[email protected]>

Default build should be Wi-Fi radio test and the Wi-Fi and ble combo build should be enabled via sysbuild Kconfig symbol. Signed-off-by: Bansidhar P.M <[email protected]>

Fix build error due to nrf70 buslib changes. Signed-off-by: Bansidhar P.M <[email protected]>

RAM retention is now managed within sys_poweroff() call. Signed-off-by: Nikodem Kastelik <[email protected]>

Zephyr system_off sample changed how RAM retention is handled. Signed-off-by: Nikodem Kastelik <[email protected]>

shanthanordic

Approvings

carlescufi requested review from a team, D-Triveni, bama-nordic and sachinthegreen as code owners December 4, 2024 16:37

github-actions bot added manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Dec 4, 2024

NordicBuilder added manifest-zephyr manifest-sidewalk DNM labels Dec 4, 2024

nordic-segl reviewed Dec 4, 2024

View reviewed changes

bama-nordic approved these changes Dec 4, 2024

View reviewed changes

shanthanordic added this to the 2.9.0 milestone Dec 4, 2024

carlescufi and others added 7 commits December 4, 2024 23:19

maanifest: Update Zephyr revision

d9f9ca1

Point to a batch merge: nrfconnect/sdk-zephyr#2339 Signed-off-by: Carles Cufi <[email protected]>

manifest: Update sdk-sidewalk revision

f47c379

Pull commit with libgcc linking fixes. Signed-off-by: Torsten Rasmussen <[email protected]>

samples: wifi: radio_test: Move FICR related file to radio test

9a7e663

Move ficr_prog.c from drivers to radio test sample as it is only used in the sample. Signed-off-by: Bansidhar P.M <[email protected]>

samples: wifi: radio_test: Disable combo build by default

afacff0

Default build should be Wi-Fi radio test and the Wi-Fi and ble combo build should be enabled via sysbuild Kconfig symbol. Signed-off-by: Bansidhar P.M <[email protected]>

wifi: Sync with nrf70 buslib changes

837de7f

Fix build error due to nrf70 buslib changes. Signed-off-by: Bansidhar P.M <[email protected]>

samples: nrf54l: remove direct RAM retention management

d10bb0c

RAM retention is now managed within sys_poweroff() call. Signed-off-by: Nikodem Kastelik <[email protected]>

benchmarks: system_off: align to new RAM retention in system_off sample

920fdad

Zephyr system_off sample changed how RAM retention is handled. Signed-off-by: Nikodem Kastelik <[email protected]>

carlescufi force-pushed the batch-merge-2.9.0 branch from 33ded99 to 920fdad Compare December 4, 2024 22:20

NordicBuilder removed the DNM label Dec 4, 2024

carlescufi mentioned this pull request Dec 4, 2024

sample: wi-fi: radio_test: Pull in nrf70 bus lib and move FICR code to radio test sample #19232

Closed

jukkar approved these changes Dec 5, 2024

View reviewed changes

shanthanordic approved these changes Dec 5, 2024

View reviewed changes

D-Triveni approved these changes Dec 5, 2024

View reviewed changes

sachinthegreen approved these changes Dec 5, 2024

View reviewed changes

nordic-babu approved these changes Dec 5, 2024

View reviewed changes

carlescufi merged commit 14d73e3 into nrfconnect:main Dec 5, 2024
13 of 14 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Batch merge 2.9.0 #19267

Batch merge 2.9.0 #19267

carlescufi commented Dec 4, 2024

NordicBuilder commented Dec 4, 2024 •

edited

Loading

carlescufi commented Dec 4, 2024

nordic-segl Dec 4, 2024

carlescufi Dec 4, 2024

nordic-segl Dec 4, 2024

carlescufi Dec 4, 2024

NordicBuilder commented Dec 4, 2024

NordicBuilder commented Dec 4, 2024 •

edited

Loading

shanthanordic left a comment

Batch merge 2.9.0 #19267

Batch merge 2.9.0 #19267

Conversation

carlescufi commented Dec 4, 2024

NordicBuilder commented Dec 4, 2024 • edited Loading

carlescufi commented Dec 4, 2024

nordic-segl Dec 4, 2024

Choose a reason for hiding this comment

carlescufi Dec 4, 2024

Choose a reason for hiding this comment

nordic-segl Dec 4, 2024

Choose a reason for hiding this comment

carlescufi Dec 4, 2024

Choose a reason for hiding this comment

NordicBuilder commented Dec 4, 2024

NordicBuilder commented Dec 4, 2024 • edited Loading

CI Information

Inputs:

Sources:

Github labels

Outputs:

Toolchain

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

shanthanordic left a comment

Choose a reason for hiding this comment

NordicBuilder commented Dec 4, 2024 •

edited

Loading

NordicBuilder commented Dec 4, 2024 •

edited

Loading