-
Notifications
You must be signed in to change notification settings - Fork 633
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 2024.12.20 #2411
Open
anangl
wants to merge
7,106
commits into
nrfconnect:main
Choose a base branch
from
anangl:meta-upmerge
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Upmerge 2024.12.20 #2411
+321,511
−88,153
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
NordicBuilder
added
manifest
manifest-hal_wch
manifest-sof
manifest-hal_stm32
manifest-zcbor
manifest-hal_infineon
manifest-hal_intel
manifest-hal_adi
manifest-mcuboot
manifest-hal_xtensa
manifest-nanopb
manifest-hal_wurthelektronik
manifest-nrf_hw_models
manifest-open-amp
manifest-nrf_wifi
manifest-picolibc
manifest-liblc3
manifest-libmetal
manifest-percepio
manifest-trusted-firmware-m
manifest-hal_renesas
manifest-hal_espressif
manifest-hal_rpi_pico
manifest-hal_tdk
manifest-hal_ambiq
manifest-hal_silabs
manifest-cmsis_6
labels
Dec 30, 2024
This is a follow-up to commit 45d827a. Although routing for those pins is configured via UICR, pinctrl still needs to be involved so that it is possible to set desired drive mode for them etc. Add also the missing RWDS pin. Upstream PR #: 80042 Applied as [nrf noup] due to a conflict in nrf-pinctrl.h Signed-off-by: Andrzej Głąbek <[email protected]>
…y map Access to this region must be requested through UICR by a local domain that want to use the Execute In Place (XIP) feature of the EXMIF peripheral. Upstream PR #: 80042 Signed-off-by: Andrzej Głąbek <[email protected]> (cherry picked from commit 71cc8b6)
… nRF54H20 DK Add nRF54H20 DK specific entries to allow using the sample on this board. Upstream PR #: 80042 Signed-off-by: Andrzej Głąbek <[email protected]> (cherry picked from commit 9edbdaf)
… template fixup! [nrf noup] tree-wide: support NCS Partition Manager (PM) definitions Signed-off-by: Torsten Rasmussen <[email protected]> (cherry picked from commit 7d364d0)
This is a follow-up to commit cdf45cb234077522b5cef2da084869af43d42dc1. Adjust the DTS node for the nRF EXMIF peripheral so that it is possible to handle the peripheral with the generic MSPI driver for DW SSI based controllers and use all its data lines in communication. Also adjust the related board files accordingly. Upstream PR #: 80042 Signed-off-by: Andrzej Głąbek <[email protected]>
…mspi-nor" devices Extend several flash samples and tests so that they can also be used with "jedec,mspi-nor" devices. Add configurations needed for the nrf54h20dk/nrf54h20/cpuapp target. Upstream PR #: 80042 Signed-off-by: Andrzej Głąbek <[email protected]>
This commit brings back modifications from these reverted commits: - f68b2ed - e606246 slightly adjusted so that the EXMIF peripheral is still by default handled by the mspi_dw driver, and in cases where this driver cannot be used because something still does not work correctly, one can switch to the old solution based on the tweaked spi_dw driver. Signed-off-by: Andrzej Głąbek <[email protected]> (cherry picked from commit 352fb6b)
Do not delete clocks for the bsim target. Clocks are referenced by peripherals and it can be used to get frequency that clocks the peripheral. Upstream PR #: 82901 Signed-off-by: Krzysztof Chruściński <[email protected]> (cherry picked from commit fbc2ac0)
…ency to 64MHz" This reverts commit 413ca65. Upstream PR #: 82901 Signed-off-by: Andrzej Głąbek <[email protected]>
Add ifdefs to make MSPI API test more generic. Signed-off-by: Jakub Zymelka <[email protected]> (cherry picked from commit fc59ce3970f17d33da8e87c112c05ad23a64a462)
Configure SDP MSPI pins to switch their control to VPR core Signed-off-by: Jakub Zymelka <[email protected]> (cherry picked from commit 2540f7b)
Add nRF54l15 overlay file to be able to run SDP MSPI API test. Signed-off-by: Jakub Zymelka <[email protected]> (cherry picked from commit abc7966)
…clusion stricter Some devices do not support nrf_clock HAL. Signed-off-by: Nikodem Kastelik <[email protected]> (cherry picked from commit ee0508793569ae8b598c28bd8f118bd591f4bc2b)
Added clock control api for global hsfll used in fast PWM120 driver. Upstream PR #: 82133 Signed-off-by: Michał Stasiak <[email protected]> (cherry picked from commit 3098bb2)
Fix failing tests for nRF54H20 target. Signed-off-by: Adam Kondraciuk <[email protected]> (cherry picked from commit eb7e947d7827de0f27a445550fefc26978fc2a14)
Fix platform radio state machine to be compliant with one shown in OpenThread's `include/openthread/platform/radio.h` Align twister tests to verify proper behavior of the state machine. Signed-off-by: Maciej Baczmanski <[email protected]> (cherry picked from commit 16695a7)
Add possibility to set channel in diag mode by implementing `platformRadioChannelSet` API. Signed-off-by: Maciej Baczmanski <[email protected]> (cherry picked from commit 3aabd42)
After openthread/openthread#11055, platform is not required to check diagnostics mode while processing commands. Signed-off-by: Maciej Baczmanski <[email protected]> (cherry picked from commit 52a1cee)
Add clock source to timers which indicates maximum frequency of the timer instance. Upstream PR #: 82901 Signed-off-by: Krzysztof Chruściński <[email protected]> (cherry picked from commit f5efb38)
Update hal_nordic so that nrfx twister files use native YAML lists. Signed-off-by: Gerard Marull-Paretas <[email protected]> (cherry picked from commit ceaf33c041c2fec891863a257c61c0edc8d9396f)
…ected MBEDTLS_AES_ROM_TABLES let Mbed TLS use precomputed AES tables instead of generating them at runtime and placing in RAM. It clearly helps reducing the RAM footprint, but at the same time it increases the ROM one. In order to let the final user decide which kind of optimization they prefer, we change the "select" statement with "imply". Upstream PR #: 83917 Signed-off-by: Valerio Setti <[email protected]>
Explicitly enable "PSA_WANT_ALG_ECB_NO_PADDING" to select the AES ECB mode that it is used in CMAC operation. Upstream PR #: 83917 Signed-off-by: Valerio Setti <[email protected]>
… rather than select Allow the user to disable the P256-M driver in case their version of Mbed TLS does not support this driver. Upstream PR #: 83917 Signed-off-by: Valerio Setti <[email protected]>
Non-secure variants for nRF7002 DK were removed from upstream in commit 10d4973. Revert these changes downstream, so that the NS variants are still available. Signed-off-by: Andrzej Głąbek <[email protected]>
…en built-in in PSA" This reverts commit ac6d834. Temporarily revert an upstream change that leads to a Kconfig dependency loop with MBEDTLS_CIPHER_AES_ENABLED. This is supposed to be replaced with a better fix later. Signed-off-by: Andrzej Głąbek <[email protected]>
This needs to be revisited but the newly added dependency on the entropy_generator doesn't work with nrf_security. Signed-off-by: Georgios Vasilakis <[email protected]>
... from BT_GATT_CACHING, because it causes a dependency loop. This change is introduced temporarily to unblock building of samples and tests. It will be eventually submitted upstream or replaced with some other solution of the issue. Signed-off-by: Andrzej Głąbek <[email protected]>
Explicitly enable "PSA_WANT_ALG_ECB_NO_PADDING" to select the AES ECB mode that it is used in CMAC operation. Signed-off-by: Andrzej Głąbek <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
DNM
manifest
manifest-cmsis_6
manifest-cmsis-dsp
manifest-hal_adi
manifest-hal_ambiq
manifest-hal_espressif
manifest-hal_ethos_u
manifest-hal_infineon
manifest-hal_intel
manifest-hal_nordic
manifest-hal_nxp
manifest-hal_renesas
manifest-hal_rpi_pico
manifest-hal_silabs
manifest-hal_st
manifest-hal_stm32
manifest-hal_tdk
manifest-hal_wch
manifest-hal_wurthelektronik
manifest-hal_xtensa
manifest-hostap
manifest-liblc3
manifest-libmetal
manifest-lvgl
manifest-mbedtls
manifest-mcuboot
manifest-nanopb
manifest-nrf_hw_models
manifest-nrf_wifi
manifest-open-amp
manifest-percepio
manifest-picolibc
manifest-segger
manifest-sof
manifest-tf-m-tests
manifest-trusted-firmware-m
manifest-zcbor
manifest-zephyr-lang-rust
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.
No description provided.