Upmerge 16.05.2024 #1721
Merged
Upmerge 16.05.2024 #1721
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rlubos
requested review from
anangl,
carlescufi,
jukkar,
gmarull,
de-nordic,
karstenkoenig and
alwa-nordic
as code owners
NordicBuilder
added
manifest
manifest-tf-m-tests
manifest-hal_nordic
manifest-babblesim_ext_2G4_phy_v1
manifest-hal_stm32
manifest-hal_espressif
manifest-hal_renesas
manifest-hal_ambiq
manifest-hal_quicklogic
manifest-segger
manifest-hal_nuvoton
manifest-trusted-firmware-m
manifest-mcuboot
manifest-nrf_hw_models
manifest-hal_silabs
manifest-hostap
manifest-loramac-node
manifest-hal_nxp
manifest-mbedtls
manifest-nanopb
labels
rlubos
force-pushed
the
upmerge-16-05-2024
branch
from
1aadbf1 to
c27f6aa
Compare
Commit 2f31ee6 ("usb: device_next: convert ASCII7 strings to UTF16LE on the fly") made string descriptors respond with twice as much of the actual string data. Fix the issue by taking into account that USB string descriptor length is already multiplied by two. Additionally, make it possible to return odd number of bytes if host requested so. Upstream PR: zephyrproject-rtos/zephyr#73079 Signed-off-by: Tomasz Moń <[email protected]> Signed-off-by: Robert Lubos <[email protected]>
Return protocol error if bcdUSB is less than 0x0201. Fix typo in number of capabilities. Fixes: b0d7d70 ("usb: device_next: add initial BOS support") Upstream PR: zephyrproject-rtos/zephyr#73018 Signed-off-by: Johann Fischer <[email protected]> Signed-off-by: Robert Lubos <[email protected]>
Display diff of contents for large buffers is not quite helpful and takes up huge RAM, and if a board has less RAM then this causes the test module build failures. So, disable display of diff and just log a failure, small buffer tests can be used to debug such basic issues and large buffer tests can act as a smoke test for debugging other issues. This saves about 80K of RAM. Fixes #72792. Upstream PR: zephyrproject-rtos/zephyr#72895 Signed-off-by: Chaitanya Tata <[email protected]> Signed-off-by: Robert Lubos <[email protected]>
…W_SPLIT only Build the vendor specific sample hci_vs_scan_req for BT_LL_SW_SPLIT variant of the Controller only. Signed-off-by: Vinayak Kariappa Chettimada <[email protected]> (cherry picked from commit 68bd4da) Signed-off-by: Robert Lubos <[email protected]>
PR #72592 made pylint to use json2 output format. However, this format is introduced in pylint v3. This commit adds an appropriate setting in the requirements file. Signed-off-by: Maciej Perkowski <[email protected]> (cherry picked from commit 3a3f25c) Signed-off-by: Robert Lubos <[email protected]>
Use wdt31 instead of wdt30 as wdt30 is hardware fixed to secure. Signed-off-by: Sebastian Bøe <[email protected]> (cherry picked from commit 9ef16f5) Signed-off-by: Robert Lubos <[email protected]>
Add missing nrf overlays to fix the sample at build time. Copied from samples/drivers/watchdog/boards. It is not clear why the build failure was not detected earlier. Signed-off-by: Sebastian Bøe <[email protected]> (cherry picked from commit afbaaf2) Signed-off-by: Robert Lubos <[email protected]>
…e domain Don't define wdt30 for the non-secure domain as it is hardware fixed to secure. Signed-off-by: Sebastian Bøe <[email protected]> (cherry picked from commit 50aaaa3) Signed-off-by: Robert Lubos <[email protected]>
… domain Don't define UICR for the non-secure domain as it is hardware fixed to secure. Signed-off-by: Sebastian Bøe <[email protected]> (cherry picked from commit 2c19d3e) Signed-off-by: Robert Lubos <[email protected]>
…r ns Define peripherals with the 0x4000_0000 address range when building for non-secure. Signed-off-by: Sebastian Bøe <[email protected]> (cherry picked from commit 90332b9) Signed-off-by: Robert Lubos <[email protected]>
Refactor the 54L board file to be able to better support out-of-tree non-secure boards. This aligns better with nrf53's DT. Signed-off-by: Sebastian Bøe <[email protected]> (cherry picked from commit 80209e4) Signed-off-by: Robert Lubos <[email protected]>
Complete rewrite of the 54l_ns DT board definition. Now the secure board and non-secure board re-use a lot more code, giving us a more maintainable solution. Signed-off-by: Sebastian Bøe <[email protected]>
… set When opaque resources have post-write callback set, but the write is not a Block-Wise write, there is no block_ctx and the code causes null pointer dereference when calculating the offset of the data. Upstream PR: zephyrproject-rtos/zephyr#73162 Signed-off-by: Seppo Takalo <[email protected]> Signed-off-by: Robert Lubos <[email protected]>
It made the build of
`samples/tfm_integration/tfm_psa_test/sample.tfm.psa_test_crypto`
break since the update of Mbed TLS to 3.6.0 (#71118), apparently because
`${ZEPHYR_BASE}` wasn't set, and the include doesn't seem to be needed.
Signed-off-by: Tomi Fontanilles <[email protected]>
(cherry picked from commit d830446)
Signed-off-by: Robert Lubos <[email protected]>
…eferences" This reverts commit b876bd2. That needs mbed TLS 3.6.0 to work, as pk_ecc.c was added in that version. To be reverted, when mbed TLS is updated to 3.6.0 in NCS. Signed-off-by: Robert Lubos <[email protected]>
… lib is used Socket service library uses eventfd, which does not work with native_posix platform, hence need to exclude it from samples that now rely on socket services. Upstream PR: zephyrproject-rtos/zephyr#73256 Signed-off-by: Robert Lubos <[email protected]>
Upstream PR: zephyrproject-rtos/zephyr#73156 Adds channel 15 to the pool of grtc channels available for allocation (i.e. with 'z_nrf_grtc_timer_chan_alloc') on nRF54H20. The change is motivated by lack of available channels for the nrf_802154_timestamper when building for nRF54H20. Signed-off-by: Piotr Koziar <[email protected]>
…ses when clock_control is not available. Upstream PR: zephyrproject-rtos/zephyr#73156 Clock_control is currently not supported on nRF54H20. This commit adds new way of handling the hfclk targeted for nRF54H20. This solution shall be replaced once the clock_control is supported for nRF54H20. Signed-off-by: Piotr Koziar <[email protected]>
Upstream PR: zephyrproject-rtos/zephyr#73156 This commit fixes the issue where a serialization error was reported after properly sending a data with 'icbmsg' backend. The icbmsg send function's return code is set to the sent data's len as in other backends. The related docs were fixed and updated. Signed-off-by: Piotr Koziar <[email protected]>
…fault for nRF54H20. Upstream PR: zephyrproject-rtos/zephyr#73156 Adds an appropriate condition to the Kconfig as the temperature driver is not supported for nRF54H20 devices yet. Without this change, a build with NRF 802.15.4 libraries produces Kconfig error. Signed-off-by: Piotr Koziar <[email protected]>
… to create EUI64. Upstream PR: zephyrproject-rtos/zephyr#73156 Use BLE.ADDR to create unique (to some extent) EUI64 on nRF54H20 in some cases inside the IEEE 802.15.4 driver. The amount of EUI64-s available in such a way is very limited (~16 million). However, currently there does not seem to be another feasible way to get device identifiers on nRF54H20 (such are kept in SICR, to which the radio core has no access). Signed-off-by: Piotr Koziar <[email protected]>
When disconnect request is successful, the status was taking as WIFI_REASON_DISCONN_UNSPECIFIED only. Adding WIFI_REASON_DISCONN_SUCCESS which can be help to determine status of disconnect request. If this status is failed then reason can be useful. Signed-off-by: Kapil Bhatt <[email protected]> (cherry picked from commit cc42d16) Signed-off-by: Robert Lubos <[email protected]>
rlubos
force-pushed
the
upmerge-16-05-2024
branch
from
15191cf to
a1769ab
Compare
carlescufi
approved these changes
May 27, 2024
rlubos
force-pushed
the
upmerge-16-05-2024
branch
from
19b3140 to
a1769ab
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Remaining isses: