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.

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

Upmerge 01.03.2024 #14321

Merged
merged 45 commits into from
Mar 21, 2024
Merged

Upmerge 01.03.2024 #14321

merged 45 commits into from
Mar 21, 2024

Conversation

rlubos
Copy link
Contributor

@rlubos rlubos commented Mar 1, 2024

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

NordicBuilder commented Mar 1, 2024

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Mar 1, 2024

Test specification

CI/Jenkins/NRF

  • Integration Platforms

CI/Jenkins/integration

Test Module File based changes Manually selected West overwrite
desktop52_verification 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-boot 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_libmodem-nrf X X
test-fw-nrfconnect-nrf-iot_lwm2m X
test-fw-nrfconnect-nrf-iot_mosh X X
test-fw-nrfconnect-nrf-iot_nrf_provisioning 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
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-low-level X X
test-sdk-audio X X
test-sdk-find-my X X
test-sdk-pmic-samples X X
test-sdk-sidewalk X X
test-sdk-wifi X X

test-fw-nrfconnect-chip: added because there was no .github/test-spec.yml in 'matter'
test-sdk-sidewalk: added because there was no .github/test-spec.yml in 'sidewalk'
test-sdk-wifi: added because there was no .github/test-spec.yml in 'hostap'
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

@rlubos rlubos force-pushed the upmerge-01-03-2024 branch from e855edb to b122078 Compare March 2, 2024 15:59
@rlubos rlubos requested a review from milewr as a code owner March 2, 2024 15:59
@rlubos rlubos force-pushed the upmerge-01-03-2024 branch from b122078 to e6579b1 Compare March 2, 2024 16:01
@rlubos rlubos marked this pull request as draft March 4, 2024 09:49
@rlubos rlubos removed request for a team March 4, 2024 09:49
jukkar and others added 27 commits March 21, 2024 16:18
The nrf7002ek and nrf7002ek_nrf7001 shields had memory overflow
of 532 bytes so adjust net RX and TX stack sizes so that the
station sample is able to run.

Signed-off-by: Jukka Rissanen <[email protected]>
Supplicant now enables POSIX_API so we need to be able to build with
POSIX enabled.

Signed-off-by: Jukka Rissanen <[email protected]>
Using memcpy to copy strings which are shorter than the requested copy
length gives compiler warnings about exceeding array bounds, for
instance:

  error: 'memcpy' forming offset 19 is out of the bounds [0, 19]

Therefore, use strncpy() instead.

Signed-off-by: Robert Lubos <[email protected]>
ANT redefines _CONCAT_2 macro, hence quarantine all samples until
fixed.

Signed-off-by: Robert Lubos <[email protected]>
New sample/test build variants for already known issues were added to
Zephyr, therefore extend the quarantine with those.

Signed-off-by: Robert Lubos <[email protected]>
Add initialization stub for LwM2M_***_INIT() macros to
work.

Remove CONFIG_LWM2M_FIRMWARE_UPDATE_OBJ_SUPPORT=y as it
is already directly included in CMakeListst.txt

Signed-off-by: Seppo Takalo <[email protected]>
Implicit promotion from float to double type now results in a
compilation warning, treated by CI as an error, hence use
explicit type cast wherever applicable.

Signed-off-by: Robert Lubos <[email protected]>
Without CONFIG_FILE_SYSTEM=y, there is this linking error

fopen.c:(.text.fopen+0x1e): undefined reference to `open'

Signed-off-by: Jukka Rissanen <[email protected]>
Do not set newlib as a default but use the system default which
is picolibc atm.

Signed-off-by: Jukka Rissanen <[email protected]>
Use the system default (picolibc) instead of forcing newlibc.
The cellular sample is still left to use newlibc as it did not
compiler properly with picolibc.

Signed-off-by: Jukka Rissanen <[email protected]>
Upstream sets some additional pages for google search which we do not
want.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
Add reference to external flash, pointing to mx25r64, to
nrf9160dk_nrf9160_ns.overlay and enable the device.

Signed-off-by: Dominik Ermel <[email protected]>
BUILD_ASSERT and offsetof caused failures during mock generation, hence
add them to exclude list.

Signed-off-by: Robert Lubos <[email protected]>
Need to define _POSIX_C_SOURCE 200809L before using gmtime_r() in
native_posix.

Signed-off-by: Robert Lubos <[email protected]>
For some strange configurations it has been observed that the sources
in TF-M's platform_crypto_keys library use TF-M headers instead of
Oberon headers as they should.

It's also observed that they are missing the include path to
tfm_sp_log.h.

Link this library with the two CMake libraries that provide the
correct include directories.

Signed-off-by: Sebastian Bøe <[email protected]>
BT_UUID_DECLARE_128() macro now returns const pointer.

Signed-off-by: Robert Lubos <[email protected]>
Fix warning about missing strnlen() declaration on native_posix
platform.

Signed-off-by: Robert Lubos <[email protected]>
Supplicant now enables POSIX_API so we need to be able to build with
POSIX enabled.

Signed-off-by: Robert Lubos <[email protected]>
Supplicant now enables POSIX_API so we need to be able to build with
POSIX enabled.

Signed-off-by: Robert Lubos <[email protected]>
Supplicant now enables POSIX_API so we need to be able to build with
POSIX enabled.

Signed-off-by: Robert Lubos <[email protected]>
UUID initialized with BT_UUID_DECLARE_16() is now const, therefore
we need to align Matter code with that change.

Signed-off-by: Robert Lubos <[email protected]>
* Refactored base_recv_cb()
* Add missing buffer size in audio_i2s.c
* Fix the ISO TX issue in bt_le_audio_tx.c
OCT-NONE
Signed-off-by: Jui-Chou Chung <[email protected]>
Extended CONFIG_BT_BUF_ACL_TX_COUNT from 3 to 12 to improve
the service discover procedure from unicast client.
OCT-NONE
Signed-off-by: Jui-Chou Chung <[email protected]>
Fixes an issue whereby MCUboot is disabled when build alongside an
image using sysbuild and partition manager support is disabled

Signed-off-by: Jamie McCrae <[email protected]>
Extra ATT buffers are configured using `CONFIG_BT_ATT_TX_COUNT`
instead of `CONFIG_BT_L2CAP_TX_BUF_COUNT`

Signed-off-by: Marcin Jelinski <[email protected]>
Update zephyr and mcuboot SHAs used for the upmerge in the release
notes.

Signed-off-by: Robert Lubos <[email protected]>
Fix warning about missing strnlen() declaration on native_posix
platform.

Signed-off-by: Robert Lubos <[email protected]>
@rlubos rlubos force-pushed the upmerge-01-03-2024 branch from 72ffd90 to ce03ac9 Compare March 21, 2024 15:18
@rlubos rlubos merged commit a6d3322 into nrfconnect:main Mar 21, 2024
39 of 45 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ble mesh Label for ble mesh PRbot. Add this if PR is related to ble mesh and you need to get review. CI-all-test Run All integration tests CI-force-downstream doc-required PR must not be merged without tech writer approval. manifest manifest-hostap manifest-matter manifest-mcuboot manifest-nrfxlib manifest-sidewalk manifest-zephyr
Projects
None yet
Development

Successfully merging this pull request may close these issues.