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

Upmerge 19.06.2023 #11559

Merged
merged 28 commits into from
Jul 3, 2023
Merged

Upmerge 19.06.2023 #11559

merged 28 commits into from
Jul 3, 2023

Conversation

rlubos
Copy link
Contributor

@rlubos rlubos commented Jun 19, 2023 •
edited by thst-nordic
Loading

Manual selection of integration branches:
test-sdk-nrf: sdk-nrf-PR-11559
test-ble: refs/pull-requests/4216/from

@github-actions github-actions bot added changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. manifest labels Jun 19, 2023
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Jun 19, 2023 •
edited
Loading

The following west manifest projects have been modified in this Pull Request:

Name Old Revision New Revision Diff
homekit https://github.com/nrfconnect/sdk-homekit/commit/2ecf5993ca6f4662517e4e287aec0eb979962112 https://github.com/nrfconnect/sdk-homekit/commit/77828c53c0753083e27f702801ac34cc56bc5c7b (main) nrfconnect/sdk-homekit@2ecf5993..77828c53
matter nrfconnect/sdk-connectedhomeip@b73fa88 nrfconnect/sdk-connectedhomeip@6d0b631 (master) nrfconnect/sdk-connectedhomeip@b73fa88e..6d0b6310
mcuboot nrfconnect/sdk-mcuboot@v1.10.0-ncs1 nrfconnect/sdk-mcuboot@4e84f31 (main) nrfconnect/sdk-mcuboot@v1.10.0-ncs1..4e84f311
trusted-firmware-m nrfconnect/sdk-trusted-firmware-m@2ff3fdd nrfconnect/sdk-trusted-firmware-m@353e621 (master) nrfconnect/sdk-trusted-firmware-m@2ff3fddf..353e6214
zephyr nrfconnect/sdk-zephyr@8f601c9 nrfconnect/sdk-zephyr@ad7ef64 (main) nrfconnect/sdk-zephyr@8f601c9e..ad7ef649

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

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Jun 19, 2023 •
edited
Loading

Test specification

CI/Jenkins/NRF

  • Integration Platforms

CI/Jenkins/integration

Test Module File based changes Manually selected West overwrite
desktop52_verification X X
test-ci-nrfconnect-boot-fw-update X X
test-fw-nrfconnect-apps X X
test-fw-nrfconnect-ble X X
test-fw-nrfconnect-ble_mesh X X
test-fw-nrfconnect-ble_samples X X
test-fw-nrfconnect-chip X X
test-fw-nrfconnect-fem X X
test-fw-nrfconnect-nfc X X
test-fw-nrfconnect-nrf-iot_cloud X X
test-fw-nrfconnect-nrf-iot_lwm2m X X
test-fw-nrfconnect-nrf-iot_mosh X X
test-fw-nrfconnect-nrf-iot_positioning X X
test-fw-nrfconnect-nrf-iot_samples X X
test-fw-nrfconnect-nrf-iot_serial_lte_modem X X
test-fw-nrfconnect-nrf-iot_thingy91 X X
test-fw-nrfconnect-nrf-iot_zephyr_lwm2m X X
test-fw-nrfconnect-nrf_crypto X X
test-fw-nrfconnect-proprietary_esb X X
test-fw-nrfconnect-rpc X X
test-fw-nrfconnect-rs X X
test-fw-nrfconnect-tfm X X
test-fw-nrfconnect-thread X X
test-fw-nrfconnect-zigbee X X
test-sdk-audio X X
test-sdk-find-my X X
test-sdk-homekit X X
test-sdk-wifi X X
test-sdk-wifi-EK-shell X X

test-ci-nrfconnect-boot-fw-update: added because there was no .github/test-spec.yml in 'mcuboot'
test-fw-nrfconnect-chip: added because there was no .github/test-spec.yml in 'matter'
test-fw-nrfconnect-tfm: added because there was no .github/test-spec.yml in 'trusted-firmware-m'
test-sdk-homekit: added because there was no .github/test-spec.yml in 'homekit'
All integration tests: added because 'CI-all-test' was added manually

Detailed information of selected test modules

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

@NordicBuilder
Copy link
Contributor

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 Publishing GitHub Action.

Adam Wojasinski and others added 24 commits July 3, 2023 15:10
@rlubos
debug: cpu_load: Align TIMER configuration macro usage
573181f 
Configuration macro for TIMER takes as a parameter frequency of the
timer that user wants to set. This patch align macro call to that.

Signed-off-by: Adam Wojasinski <adam.wojasinski@nordicsemi.no>
@rlubos
samples: peripheral: 802154_phy_test: Align GPIOTE and TIMER APIs
82c954f 
GPIOTE driver has been complitely reworked in nrfx 3.0.0.
Aligned code in a way that is suggested in migration notes from
nrfx 2.11.0 to nrfx 3.0.0 that is available at
https://github.com/NordicSemiconductor/nrfx/wiki/nrfx-2.11.0-to-3.0.0

Signed-off-by: Adam Wojasinski <adam.wojasinski@nordicsemi.no>
@MarekPieta @rlubos
applications: nrf_desktop: Disable image list hash support on nRF52820
86c682a 
Change disables CONFIG_BOOT_SERIAL_IMG_GRP_HASH in MCUboot bootloader
configuration of boards that use nRF52820 SoC. This is needed to reduce
the memory consumption.

Jira: NCSDK-21638

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
@rlubos
lib: date_time: Fix dependency to POSIX network APIs
0bb1d72 
SNTP library no longer relies on POSIX network APIs/headers, and there's
no need for date_time lib to rely on them either. Therefore, make the
library indifferent on POSIX configuration by using zsock APIs directly.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
@rlubos
zigbee: Align with upstream 15.4 API changes
80f80be 
Align zigbee codebase with upstream 15.4 API changes.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
@rlubos
mgmt: mcumgr: Align codebase with the new callback format
2366deb 
Align NCS codebase with the new struct mgmt_callback format.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
@rlubos
samples: nrf9160: lwm2m_client: Prevent name collission with sensor API
8c25bb9 
sensor_read() is now a part of the public sensor AI, therefore need to
use a different name in the sample to avoid conflict.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
@rlubos
lib: st25r3911b: Align with upstream SPI CS changes
abde095 
Align with the upstream SPI CS API changes.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
@rlubos
bluetooth: mesh: Align with the upstream API changes
e3e01d2 
Align bluetooth mesh tests with the upstream API changes.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
@rlubos
libc: Avoid using deprecated MINIMAL_LIBC_MALLOC_ARENA_SIZE
2d13da2 
CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE was deprecated and should no
longer be used.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
@maje-emb @rlubos
samples: bluetooth: peripheral_mds: Disable SENSOR_SHELL
70fac1e 
To reduce RAM usage, `SENSOR_SHELL` is disabled.

Signed-off-by: Marcin Jelinski <marcin.jelinski@nordicsemi.no>
@aasinclair @rlubos
samples: pmic: npm1300_fuel_gauge: Added Kconfig modules
bf83755 
Required modules have been added to prj.conf.
These were previously added by the shield defconfig but
this has been deleted upstream.

Signed-off-by: Andy Sinclair <andy.sinclair@nordicsemi.no>
@rlubos
samples: bluetooth: mesh: silvair_enocean: Fix Kconfig dependencies
5c81399 
CONFIG_BT_HOST_CCM, which is a dependency for CONFIG_BT_ENOCEAN is no
longer enabled automatically by Zephyr, hence enable it manually in the
project file.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
@MarekPieta @rlubos
applications: nrf_desktop: Reduce MCUboot FLASH size (serial recovery)
b274add 
Decrease number of USBD endpoints in DTS to reduce FLASH consumption.
The MCUboot uses USB only for serial recovery over CDC ACM class.

Jira: NCSDK-22309

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
@gregersrygg @rlubos
applications: asset_tracker_v2: Fix nrf7002ek_wifi
6ea9382 
Workaround for enabling the external flash on nRF9160 DK when using
the nRF7002ek shield. Add external flash overlay to fix build failure.

Signed-off-by: Gregers Gram Rygg <gregers.gram.rygg@nordicsemi.no>
@gregersrygg @rlubos
boards: Clean up high drive mode for nrf9160dk and nrf9161dk
fccfeab 
High drive mode is now enabled on SPI3 for the board definitions in
Zephyr. Clean up unnecessary enabling of high drive mode in overlays.

Signed-off-by: Gregers Gram Rygg <gregers.gram.rygg@nordicsemi.no>
@MarekPieta @rlubos
applications: nrf_desktop: Align upload reset in DFU MCUmgr module
630c711 
Change aligns the upload reset handling in the DFU MCUmgr application
module to newly introduced public API of MCUmgr.

Jira: NCSDK-21434

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
@rlubos
lib: nrf_modem_lib: trace_backends: uart: Align code to driver changes
bb98a38 
nrfx UARTE driver renamed member of the configuration structure
and added new parameter to driver API.

Signed-off-by: Adam Wojasinski <adam.wojasinski@nordicsemi.no>
Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
@rlubos
samples: peripheral: 802154_phy_test: Remove obsolete workaround
960a212 
After the upmerge the sample no longer fit into FLASH on
nrf5340dk_nrf5340_cpunet. Remove an obsolete workaround from the
sample configuration to reduce sample FLASH footprint.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
@sebastiandraus @rlubos
zigbee: Enable NRF_STORE_REBOOT_TYPE_GPREGRET by default
999557b 
This commit enables NRF_STORE_REBOOT_TYPE_GPREGRET Kconfig option
for all Zigbee samples so the reset reason is stored between device
reboot.

Signed-off-by: Sebastian Draus <sebastian.draus@nordicsemi.no>
@rlubos
doc: release-notes: Update Zephyr revision in the release notes
6f5c7a2 
Update the Zephyr revision referenced in the release notes to align with
the latest upmerge.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
@magnev @rlubos
ESB: Updated esb_timer to use new frequency macro
9b06c9a 
Using new macro NRFX_MHZ_TO_HZ to describe 1MHz

Signed-off-by: Magne Værnes <magne.varnes@nordicsemi.no>
@gWacey @rlubos
applications: nrf5340_audio: Upmerge 19-06-2023
a4bdeef 
	CIS gateway application update for the discovery refactor and
	timer update.

Signed-off-by: Graham Wacey <graham.wacey@nordicsemi.no>
Signed-off-by: Alexander Svensen <alexander.svensen@nordicsemi.no>
@rlubos
applications: nrf5340_audio: Align with chan_allocation API change
dd3123d 
bt_codec_cfg_get_chan_allocation_val() now expects a pointer to
enum bt_audio_location.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
@NordicBuilder NordicBuilder removed the DNM label Jul 3, 2023
@rlubos
Copy link
Contributor Author

rlubos commented Jul 3, 2023

All jobs passed after reruns, merging.

@rlubos rlubos merged commit 1ae2edb into nrfconnect:main Jul 3, 2023
@awojasinski awojasinski mentioned this pull request Jul 4, 2023
Closed
@glarsennordic glarsennordic mentioned this pull request Jul 6, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@awojasinski awojasinski awojasinski left review comments

@glarsennordic glarsennordic glarsennordic approved these changes

@Damian-Nordic Damian-Nordic Damian-Nordic left review comments

@MirkoCovizzi MirkoCovizzi MirkoCovizzi left review comments

@sachinthegreen sachinthegreen sachinthegreen approved these changes

@pdunaj pdunaj pdunaj approved these changes

@SeppoTakalo SeppoTakalo SeppoTakalo approved these changes

@sigvartmh sigvartmh sigvartmh approved these changes

@sebastiandraus sebastiandraus sebastiandraus approved these changes

@MarekPieta MarekPieta MarekPieta approved these changes

@gregersrygg gregersrygg gregersrygg approved these changes

@tomchy tomchy tomchy approved these changes

@ludvigsj ludvigsj ludvigsj approved these changes

@tejlmand tejlmand Awaiting requested review from tejlmand

@carlescufi carlescufi Awaiting requested review from carlescufi

@tokangas tokangas Awaiting requested review from tokangas tokangas is a code owner

@lemrey lemrey Awaiting requested review from lemrey lemrey is a code owner

@koffes koffes Awaiting requested review from koffes

@grochu grochu Awaiting requested review from grochu

@plskeggs plskeggs Awaiting requested review from plskeggs

@jayteemo jayteemo Awaiting requested review from jayteemo

@jtguggedal jtguggedal Awaiting requested review from jtguggedal

@coderbyheart coderbyheart Awaiting requested review from coderbyheart coderbyheart is a code owner

Assignees
No one assigned
Labels
changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. CI-all-test Run All integration tests CI-force-downstream doc-required PR must not be merged without tech writer approval. manifest manifest-homekit manifest-matter manifest-mcuboot manifest-trusted-firmware-m manifest-zephyr
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.