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

manifest: Upmerge #12112

Merged
merged 34 commits into from
Oct 2, 2023
Merged

manifest: Upmerge #12112

merged 34 commits into from
Oct 2, 2023

Conversation

de-nordic
Copy link
Contributor

@de-nordic de-nordic commented Aug 22, 2023

manifest: Upmerge of sdk-nrf repositories

The commit brings in changes to

  • sdk-mcboot, upmerge to fc658eb5a22b7b1721c3b7d0853a7115fae08939
    • required fixes.
  • sdk-zephyr, upmerge to 5f0efb9
    • required fixes.

test-sdk-nrf: sdk-nrf-pr-12112

@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 Aug 22, 2023
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Aug 22, 2023

Test specification

CI/Jenkins/NRF

  • Integration Platforms

CI/Jenkins/integration

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

test-ci-nrfconnect-boot-fw-update: added because there was no .github/test-spec.yml in 'mcuboot'
test-sdk-homekit: added because there was no .github/test-spec.yml in 'homekit'
test-sdk-sidewalk: added because there was no .github/test-spec.yml in 'sidewalk'
All integration tests: null

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.

@de-nordic de-nordic changed the title manifest: Upmerge of sdk-mcuboot manifest: Upmerge Aug 28, 2023
@de-nordic de-nordic force-pushed the upmerge-20230823 branch 9 times, most recently from f44dd9f to b43789a Compare August 31, 2023 09:01
@de-nordic de-nordic force-pushed the upmerge-20230823 branch 2 times, most recently from 2e6d95c to 91a5d74 Compare August 31, 2023 10:02
@koffes koffes self-requested a review August 31, 2023 10:36
Manually enable NEWLIB_LIBC as picolib is now the deafult.
Set CONFIG_NRF_MODEM_LIB_TRACE_BACKEND_UART=n, as a
custom backend is desired in this sample.

Signed-off-by: Richard McCrae <richard.mccrae@nordicsemi.no>
Zephyr has introduced new Kconfig option CONFIG_POSIX_SIGNAL,
which defines many signals such as SIGINT, SIGTERM and SIGHUP.
These have been used in iperf3 code. However, the caller of this code
has been flagged out when CONFIG_NRF_IPERF3_INTEGRATION has not been
defined. Hence, flagging also iperf_catch_sigend() function.

Signed-off-by: Tommi Rantanen <tommi.rantanen@nordicsemi.no>
Minimal libc selection has to be forced for all Matter-related
mcuboot builds. Otherwise the picolib is enabled and image
size increases by several k, so it cannot fit in the dedicated
partition.

Signed-off-by: Kamil Kasperczyk <kamil.kasperczyk@nordicsemi.no>
eivindj-nordic and others added 22 commits October 2, 2023 10:17
Update UART Kconfigs as CONFIG_UART_0_NRF_UART etc. is removed.

Signed-off-by: Eivind Jølsgard <eivind.jolsgard@nordicsemi.no>
Change disables GPIO interrupt support in Zephyr GPIO driver for MCUboot
configurations that support serial recovery. This is needed to reduce
memory footprint.

Jira: NCSDK-23410

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
Change switches to using minimal libc for child images to decrease
memory footprint.

Jira: NCSDK-23491

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
Change removes configurations based on nRF52820 SoC from quarantine.
The flash overflow no longer replicates after applying memory
optimizations.

Jira: NCSDK-23410

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
Change switches to using minimal libc by default in the nRF Desktop
application.

Jira: NCSDK-23491

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
The CONFIG_USB_COMPOSITE_DEVICE is now selected by CONFIG_USB_CDC_ACM
that is used for MCUboot serial recovery. Application cannot disable it.
Enabling CONFIG_USB_COMPOSITE_DEVICE does not increase memory footprint
of the bootloader.

Change also removes the line disabling CONFIG_USB_MASS_STORAGE. The
option is disabled by default, there is no need to disable it
explicitly.

Jira: NCSDK-23491

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
Signature of the k_mem_slab_free() has changed:
void **mem -> void *mem.

Update the usage of k_mem_slab_free().

Signed-off-by: Markus Lassila <markus.lassila@nordicsemi.no>
Affects applications, samples and tests.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
This patch made sure that EI_URI is threaten as string by CMake.
zephyr-rtos changed so EI_URICONFIG_EDGE_IMPULSE_URI is transferred
witch semicolon - so it is recognized as a list of string instead of
a string like it was before.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
- Moved PA_sync callbacks to bt_mgmt
- Adjusted le_audio files for refactored host code

Signed-off-by: Kristoffer Rist Skøien <kristoffer.skoien@nordicsemi.no>
Signed-off-by: Alexander Svensen <alexander.svensen@nordicsemi.no>
Implementation header and API headers are split. Include implementation
header for the lte_connectivity implementation.

Signed-off-by: Eivind Jølsgard <eivind.jolsgard@nordicsemi.no>
void main(...) is no longer allowed.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
The enum bt_conn_type is used for type now.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
CONFIG_IPC_SERVICE_ICMSG_CB_BUF_SIZE no longer exists.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
The CONFIG_CRC needs to be explicitly selected by project
configuration.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
Use the system time.h for native posix or external time.h
for external lib C.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
Upstream Zephyr PR#57884 adjusted the inclusion of sysbuild modules
so that these are now sourced in a different scope.

This cause PM related variables to not be available when running
partition manager CMake code as part of sysbuild.

PM related variables are therefore changed to global properties, making
the partition manager related code more robust.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Use the system time.h for native posix or external time.h
for external lib C.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
Disable it as it causes problems with memfault builds.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
Adds building bootutil, when DFU with MCUmgr is enabled, for
application image definitions.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
Change add test edge_impulse.ei_wrapper on qemu_cortex_m3 to
quarantine.

Signed-off-by: Katarzyna Giądła <katarzyna.giadla@nordicsemi.no>
There are some changes in wifi.h header file, which
converts static arrays to functions. Replacing the arrays
to function calls.

Signed-off-by: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
@de-nordic de-nordic merged commit 0fe4020 into nrfconnect:main Oct 2, 2023
36 of 39 checks passed
@de-nordic de-nordic deleted the upmerge-20230823 branch March 4, 2024 19:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.