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 16.05.2024 #15351

Merged
merged 39 commits into from
May 28, 2024
Merged

Upmerge 16.05.2024 #15351

merged 39 commits into from
May 28, 2024

Commits on May 28, 2024

  1. manifest: Pull upmerged repositories 

    Pull upmerged sdk-zephyr and sdk-mcuboot repositories.
Pull fixes in matter and find-my, sidewalk, trusted-firmware-m.

Signed-off-by: Robert Lubos <[email protected]>
    @rlubos
    rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    ca49f68 View commit details
    Browse the repository at this point in the history

  2. doc: mcuboot: Make sure PORTING.md is visible 

    PORTING.md is now referenced by other docs, hence make sure it's visible
during doc build.

Signed-off-by: Robert Lubos <[email protected]>
    @rlubos
    rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    a6b21d7 View commit details
    Browse the repository at this point in the history

  3. bluetooth: Don't reference removed Kconfig symbols 

    Specifically NET_L2_BT and NET_L2_BT_SHELL.

Signed-off-by: Robert Lubos <[email protected]>
    @rlubos
    rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    ae5208f View commit details
    Browse the repository at this point in the history

  4. bluetooth: Remove CONFIG_BT_HCI_RAW_RESERVE 

    d590bcb removed the
CONFIG_BT_HCI_RAW_RESERVE Kconfig option. Align NCS to the change.

Jira: NCSDK-27508

Signed-off-by: Marek Pieta <[email protected]>
    @MarekPieta @rlubos
    MarekPieta authored and rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    3dbff88 View commit details
    Browse the repository at this point in the history

  5. sample: wifi: ble_coex: Ignore zperf periodic results 

    A new calblack event (ZPERF_SESSION_PERIODIC_RESULT) has been added to
zperf, just ignore it int the sample for now to prevent build warnings.

Signed-off-by: Robert Lubos <[email protected]>
    @rlubos
    rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    f2e2c53 View commit details
    Browse the repository at this point in the history

  6. net: lwm2m: Align with lwm2m_engine_set_data_cb_t API change 

    lwm2m_engine_set_data_cb_t callback signaure now has an additional
offset parameter.

Signed-off-by: Robert Lubos <[email protected]>
    @rlubos
    rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    bf2a4f6 View commit details
    Browse the repository at this point in the history

  7. kernel: Remove NCS boot banner dependency 

    NCS boot banner has to be standalone entity from Zephyr boot banner.

Signed-off-by: Robert Lubos <[email protected]>
    @rlubos
    rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    c2066c7 View commit details
    Browse the repository at this point in the history

  8. nrf_security: Fix incompatibility with MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG 

    MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG symbol has been added as an choice
option in upstream Zephyr, which is not compatible with how nrf_security
interprets the symbol. Try to fix this on the nrf_security side.

Signed-off-by: Robert Lubos <[email protected]>
    @rlubos
    rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    38517da View commit details
    Browse the repository at this point in the history

  9. samples: net: mqtt: Align with SFM_CREATE_STATE API changes 

    From the upstream migration guide:

The SMF_CREATE_STATE macro now always takes 5 arguments. The amount
of arguments is now independent of the values of
CONFIG_SMF_ANCESTOR_SUPPORT and CONFIG_SMF_INITIAL_TRANSITION.
If the additional arguments are not used, they have to be set to NULL

Signed-off-by: Robert Lubos <[email protected]>
    @rlubos
    rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    2ad82ec View commit details
    Browse the repository at this point in the history

  10. bluetooth: Remove bt_read_static_addr() "hack" 

    Align code after 484fe3f was added to
Zephyr.

Jira: NCSDK-27508

Signed-off-by: Marek Pieta <[email protected]>
    @MarekPieta @rlubos
    MarekPieta authored and rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    86b881c View commit details
    Browse the repository at this point in the history

  11. bluetooth: controller: Merge BT_HCI_VS_EXT into BT_HCI_VS 

    18c23da removes CONFIG_BT_HCI_VS_EXT.
Align BLE controller configuration with the changes.

Jira: NCSDK-27508

Signed-off-by: Marek Pieta <[email protected]>
    @MarekPieta @rlubos
    MarekPieta authored and rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    f3ddf95 View commit details
    Browse the repository at this point in the history

  12. lib: fatal_error: Don't enable fatal handler by default globally 

    Enabling custom fatal error handler globally can be problematic for
sdk-zephyr samples built in NCS context, as they may define their own
handlers, causing linker error. As there's no elegant way to handle that
on the sample side, other than noup patches in sdk-zephyr, disable the
RESET_ON_FATAL_ERROR config by default.

As an alternative for NCS, the config will now be implied by
NCS_SAMPLES_DEFAULTS config, which is exclusive for NCS samples only.

Additionally, enable CONFIG_REBOOT in a few samples, which rely on
reboot functionality but did not enable config explicitly.

Signed-off-by: Robert Lubos <[email protected]>
    @rlubos
    rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    6aafb28 View commit details
    Browse the repository at this point in the history

  13. applications: nrf_desktop: Disable NCS boot banner 

    nRF Desktop application does not use boot banners provided by Zephyr
and NCS.

Jira: NCSDK-27508

Signed-off-by: Marek Pieta <[email protected]>
    @MarekPieta @rlubos
    MarekPieta authored and rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    956e61f View commit details
    Browse the repository at this point in the history

  14. modules: memfault: Override MEMFAULT_HTTP_USES_MBEDTLS config default 

    Having mbed TLS enabled in the system does not automatically mean it's
used for HTTPS communication in memfault. If offloaded sockets are used,
it's not the case regardless of mbed TLS configurations.

Override the default value for MEMFAULT_HTTP_USES_MBEDTLS config in case
NRF_MODEM_LIB is enabled to n. This config simply enables some extra
checks for mbed TLS configuration (whether it fits memfault needs), but
since it's not really used for offloaded sockets, it can generate
false errors. By default, the config is set to y whenever mbed TLS is
enabled, which is oversimplified condition for our case.

Signed-off-by: Robert Lubos <[email protected]>
    @rlubos
    rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    d1b0c9f View commit details
    Browse the repository at this point in the history

  15. samples: matter: Renamed rram0 label for nRF54l15pdk 

    Changed rram0 dts label name to the cpuapp_rram for nrf54l15pdk
board.

Signed-off-by: Kamil Kasperczyk <[email protected]>
    @kkasperczyk-no @rlubos
    kkasperczyk-no authored and rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    5027929 View commit details
    Browse the repository at this point in the history

  16. boards: shields: disable NCS_BOOT_BANNER for nRF22xx shields 

    Boot banner must be disabled for nRF2220 and nRF2240 front-end modules
to avoid conflicts between TWIM and UART instances on initialization.

Signed-off-by: Jędrzej Ciupis <[email protected]>
    @rlubos
    Jędrzej Ciupis authored and rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    8734032 View commit details
    Browse the repository at this point in the history

  17. debug: etb_trace: Covert SOC_ON_EXIT_CPU_IDLE handler to C 

    Upstream commit 4760aad changed CPU
idle handler from asm to C, so align with that change.

Signed-off-by: Robert Lubos <[email protected]>
    @rlubos
    rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    c6ebff7 View commit details
    Browse the repository at this point in the history

  18. samples: wifi: sta: Fix RAM overflow for nRF52840 

    Reduce WPA supplicant stack size to accommodate RAM requirements for
nRF52840.

Signed-off-by: Chaitanya Tata <[email protected]>
    @krish2718 @rlubos
    krish2718 authored and rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    80db85c View commit details
    Browse the repository at this point in the history

  19. scripts: Quarantine Wi-Fi on nRF54L15 

    nRF54L15 has low RAM, so, till we optimize Wi-Fi RAM requirements,
temporarily quarantine this twister combination.

Signed-off-by: Chaitanya Tata <[email protected]>
    @krish2718 @rlubos
    krish2718 authored and rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    62b36e8 View commit details
    Browse the repository at this point in the history

  20. applications: nrf_desktop: Align RRAM configuration for nRF54L15 PDK 

    Change aligns RRAM configuration for nRF54L15 PDK. The application does
not use cpuflpr core, so whole memory can be used by cpuapp.

Jira: NCSDK-27508

Signed-off-by: Marek Pieta <[email protected]>
    @MarekPieta @rlubos
    MarekPieta authored and rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    44b6c2a View commit details
    Browse the repository at this point in the history

  21. Applications: nrf5340_audio: Upmerge fixes 

    OCT-3020
Resolved build issues

Signed-off-by: Kristoffer Rist Skøien <[email protected]>
    @koffes @rlubos
    koffes authored and rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    c052a60 View commit details
    Browse the repository at this point in the history

  22. scripts: Extend Zephyr tests/samples quarantine 

    See comments along the quarantine entries for reasoning.

Signed-off-by: Robert Lubos <[email protected]>
    @rlubos
    rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    8d3647f View commit details
    Browse the repository at this point in the history

  23. samples: wifi: shell: Increase net management buffers 

    Despite increasing the timeout, sometimes we still see failures in
pushing a net management event, so, increase the queue size to fix such
scenarios.

Fixes SHEL-2773.

Signed-off-by: Chaitanya Tata <[email protected]>
    @krish2718 @rlubos
    krish2718 authored and rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    50b0fed View commit details
    Browse the repository at this point in the history

  24. boards: 54l: ns: Delete the deprecated nrf54l15_cpuapp_ns.dtsi 

    After some reorganization this file is no longer in use.

Signed-off-by: Sebastian Bøe <[email protected]>
    @SebastianBoe @rlubos
    SebastianBoe authored and rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    3fedac2 View commit details
    Browse the repository at this point in the history

  25. Applications: nrf5340_audio: Upmerge fixes2 

    OCT-3020
Resolved BIS+ACL tester upmerge issues

Signed-off-by: Kristoffer Rist Skøien <[email protected]>
    @koffes @rlubos
    koffes authored and rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    88b4d53 View commit details
    Browse the repository at this point in the history

  26. requirements: Updated pylint version 

    Pylint requires min version 3 to work

Signed-off-by: Maciej Perkowski <[email protected]>
Signed-off-by: Robert Lubos <[email protected]>
    @PerMac @rlubos
    PerMac authored and rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    48493db View commit details
    Browse the repository at this point in the history

  27. samples: cellular: fmfu_smp_svr: Enable CRC in the sample 

    Enable CONFIG_CRC, which is a dependency for mcumgr UART transport.

Signed-off-by: Robert Lubos <[email protected]>
    @rlubos
    rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    a55423b View commit details
    Browse the repository at this point in the history

  28. samples: Use default nrf54l15pdk/nrf54l15/cpuapp revision in twister 

    Revision 0.3.0 is now the default revision of
nrf54l15pdk/nrf54l15/cpuapp board, hence no longer recognisable by
twister if provided explicitly. Update yaml files accordingly to reflect
that.

Signed-off-by: Robert Lubos <[email protected]>
    @rlubos
    rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    8ea9e77 View commit details
    Browse the repository at this point in the history

  29. applications: nrf_desktop: Change watchdog instance for nrf54l15 

    The default watchdog instance for nrf54l15 is now wdt31.

Signed-off-by: Robert Lubos <[email protected]>
    @rlubos
    rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    72d9ef5 View commit details
    Browse the repository at this point in the history

  30. scripts: Qurantine nRF54H Wi-Fi test 

    This needs a revised memory layout for Wi-Fi to easily extend RAM and
FLAH, so, on hold for now to unblock upmerge.

Fixes SHEL-2777.

Signed-off-by: Chaitanya Tata <[email protected]>
    @krish2718 @rlubos
    krish2718 authored and rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    6c477e0 View commit details
    Browse the repository at this point in the history

  31. lib: net: softap_wifi_provision: Align with SFM API changes 

    From the upstream migration guide:

The SMF_CREATE_STATE macro now always takes 5 arguments. The amount
of arguments is now independent of the values of
CONFIG_SMF_ANCESTOR_SUPPORT and CONFIG_SMF_INITIAL_TRANSITION.
If the additional arguments are not used, they have to be set to NULL

Signed-off-by: Robert Lubos <[email protected]>
    @rlubos
    rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    c30ea28 View commit details
    Browse the repository at this point in the history

  32. suit: flash_companion: Adjust minimal configuration 

    Adjust Kconfigs to match the new set of options and dependencies.

Ref: NCSDK-NONE

Signed-off-by: Tomasz Chyrowicz <[email protected]>
    @tomchy @rlubos
    tomchy authored and rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    ec5957f View commit details
    Browse the repository at this point in the history

  33. samples: matter: Disabled NCS boot banner in the sysbuild mcuboot 

    Disabled NCS boot banner for the sysbuild mcuboot config
to decrease the flash usage and fit the assumed partition size.

Signed-off-by: Kamil Kasperczyk <[email protected]>
    @kkasperczyk-no @rlubos
    kkasperczyk-no authored and rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    540f98f View commit details
    Browse the repository at this point in the history

  34. samples: Don't use deprecated NET_SOCKETS_POSIX_NAMES 

    Switch to POSIX_API instead. Fix build issues corresponding to this
change.

Signed-off-by: Robert Lubos <[email protected]>
    @rlubos
    rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    a50bde9 View commit details
    Browse the repository at this point in the history

  35. samples: fast_pair: input_device: Fix build failures on nRF5340 DK 

    Change brings back hci_ipc configuration used for child images to fix
build errors on nRF5340 DK.

Jira: NCSDK-27508

Signed-off-by: Marek Pieta <[email protected]>
    @MarekPieta @rlubos
    MarekPieta authored and rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    24ddd07 View commit details
    Browse the repository at this point in the history

  36. samples: bluetooth: Remove uses of auto name in advertising 

    The adv options to automatically add the name in the advertising and
scan response data are deprecated.

Update the samples that used those options to explicitly include
the name in the advertising and scan response data.

Signed-off-by: Michał Grochala <[email protected]>
Signed-off-by: Robert Lubos <[email protected]>
    @grochu @rlubos
    grochu authored and rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    a76b81c View commit details
    Browse the repository at this point in the history

  37. doc: release-notes-changelog: Update Zephyr SHAs used in the upmerge 

    Update upstream Zephyr SHA to ea02b93.

Signed-off-by: Robert Lubos <[email protected]>
    @rlubos
    rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    38309fe View commit details
    Browse the repository at this point in the history

  38. scripts: Quarantine iso_time_sync on nrf54l15pdk 

    GPIOTE cannot be used with LED0 on nrf54l15pdk/nrf54l15/cpuapp in
version 0.3.0.

Signed-off-by: Robert Lubos <[email protected]>
    @rlubos
    rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    cf31f50 View commit details
    Browse the repository at this point in the history

  39. samples: bluetooth: connection_event_trigger: Increase BT_RX_STACK_SIZE 

    The stack size needs to be increased after the upmerge, as the sample
reports stack overflow when printing logs.

Signed-off-by: Robert Lubos <[email protected]>
    @rlubos
    rlubos committed May 28, 2024
    Configuration menu
    Copy the full SHA
    0d202c3 View commit details
    Browse the repository at this point in the history