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 2024.12.20 #2411

Open
wants to merge 7,106 commits into
base: main
Choose a base branch
from
Open

Upmerge 2024.12.20 #2411

wants to merge 7,106 commits into from

Conversation

anangl
Copy link
Contributor

@anangl anangl commented Dec 30, 2024

No description provided.

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Dec 30, 2024

The following west manifest projects have been modified in this Pull Request:

Name Old Revision New Revision Diff
cmsis-dsp zephyrproject-rtos/cmsis-dsp@6489e77 (zephyr-3.6) zephyrproject-rtos/cmsis-dsp@d80a49b (zephyr-4.0) zephyrproject-rtos/[email protected]
cmsis_6 N/A zephyrproject-rtos/CMSIS_6@783317a (main) N/A
hal_adi zephyrproject-rtos/hal_adi@de5dadb zephyrproject-rtos/hal_adi@b1a1023 (main) zephyrproject-rtos/[email protected]
hal_ambiq zephyrproject-rtos/hal_ambiq@df4a986 zephyrproject-rtos/hal_ambiq@87a188b zephyrproject-rtos/[email protected]
hal_espressif zephyrproject-rtos/hal_espressif@aa6a967 zephyrproject-rtos/hal_espressif@e523710 zephyrproject-rtos/[email protected]
hal_ethos_u zephyrproject-rtos/hal_ethos_u@8e2cf75 zephyrproject-rtos/hal_ethos_u@50ddffc (main) zephyrproject-rtos/[email protected]
hal_infineon zephyrproject-rtos/hal_infineon@88d2529 zephyrproject-rtos/hal_infineon@a9b75e0 zephyrproject-rtos/[email protected]
hal_intel zephyrproject-rtos/hal_intel@0905a52 zephyrproject-rtos/hal_intel@0355bb8 (main) zephyrproject-rtos/[email protected]
hal_nordic zephyrproject-rtos/hal_nordic@fae1542 zephyrproject-rtos/hal_nordic@ecea8cd (master) zephyrproject-rtos/[email protected]
hal_nxp zephyrproject-rtos/hal_nxp@f4e26fa zephyrproject-rtos/hal_nxp@0ac8302 zephyrproject-rtos/[email protected]
hal_renesas zephyrproject-rtos/hal_renesas@1ec8891 zephyrproject-rtos/hal_renesas@64fce2e zephyrproject-rtos/[email protected]
hal_rpi_pico zephyrproject-rtos/hal_rpi_pico@fba7162 zephyrproject-rtos/hal_rpi_pico@79ee0f9 (zephyr) zephyrproject-rtos/[email protected]
hal_silabs zephyrproject-rtos/hal_silabs@4c813a1 zephyrproject-rtos/hal_silabs@6371fa8 zephyrproject-rtos/[email protected]
hal_st zephyrproject-rtos/hal_st@b2f548f zephyrproject-rtos/hal_st@05fd453 (master) zephyrproject-rtos/[email protected]
hal_stm32 zephyrproject-rtos/hal_stm32@c4099c2 zephyrproject-rtos/hal_stm32@3784237 zephyrproject-rtos/[email protected]
hal_tdk N/A zephyrproject-rtos/hal_tdk@e0ade95 N/A
hal_wch N/A zephyrproject-rtos/hal_wch@1de9d3e (main) N/A
hal_wurthelektronik zephyrproject-rtos/hal_wurthelektronik@e5bcb2e zephyrproject-rtos/hal_wurthelektronik@e3e2797 (zephyr) zephyrproject-rtos/[email protected]
hal_xtensa zephyrproject-rtos/hal_xtensa@a2d6585 zephyrproject-rtos/hal_xtensa@baa56aa zephyrproject-rtos/[email protected]
hostap zephyrproject-rtos/hostap@4428531 zephyrproject-rtos/hostap@516cf57 zephyrproject-rtos/[email protected]
liblc3 zephyrproject-rtos/liblc3@1a5938e zephyrproject-rtos/liblc3@bb85f7d (main) zephyrproject-rtos/[email protected]
libmetal zephyrproject-rtos/libmetal@a6851ba zephyrproject-rtos/libmetal@3e8781a (main) zephyrproject-rtos/[email protected]
lvgl zephyrproject-rtos/lvgl@2b498e6 zephyrproject-rtos/lvgl@6decbb7 (master) zephyrproject-rtos/[email protected]
mbedtls zephyrproject-rtos/mbedtls@fb36f3f zephyrproject-rtos/mbedtls@4952e13 (zephyr) zephyrproject-rtos/[email protected]
mcuboot zephyrproject-rtos/mcuboot@e890df7 zephyrproject-rtos/mcuboot@a2bc982 (main,upstream-sync) zephyrproject-rtos/[email protected]
nanopb zephyrproject-rtos/nanopb@4474bd3 zephyrproject-rtos/nanopb@7307ce3 (master) zephyrproject-rtos/[email protected]
nrf_hw_models zephyrproject-rtos/nrf_hw_models@fbc6e61 zephyrproject-rtos/nrf_hw_models@71bcaa8 zephyrproject-rtos/[email protected]
nrf_wifi zephyrproject-rtos/nrf_wifi@f6b950a zephyrproject-rtos/nrf_wifi@0f53c9e zephyrproject-rtos/[email protected]
open-amp zephyrproject-rtos/open-amp@b735edb zephyrproject-rtos/open-amp@52bb178 (main) zephyrproject-rtos/[email protected]
percepio zephyrproject-rtos/percepio@b68d179 zephyrproject-rtos/percepio@0d44033 (zephyr) zephyrproject-rtos/[email protected]
picolibc zephyrproject-rtos/picolibc@27746bb zephyrproject-rtos/picolibc@82d62ed (zephyr-no-lto) zephyrproject-rtos/[email protected]
segger zephyrproject-rtos/segger@b011c45 zephyrproject-rtos/segger@cf56b1d (master) zephyrproject-rtos/[email protected]
sof zephyrproject-rtos/sof@0e4c4ef zephyrproject-rtos/sof@bc08c9c (zephyr) zephyrproject-rtos/[email protected]
tf-m-tests zephyrproject-rtos/tf-m-tests@d552e4f zephyrproject-rtos/tf-m-tests@502ea90 (main,v3.7-branch) zephyrproject-rtos/[email protected]
trusted-firmware-m zephyrproject-rtos/trusted-firmware-m@a11cd27 zephyrproject-rtos/trusted-firmware-m@fa020a8 zephyrproject-rtos/[email protected]
zcbor zephyrproject-rtos/zcbor@47f34dd zephyrproject-rtos/zcbor@9b07780 (main) zephyrproject-rtos/[email protected]
zephyr-lang-rust N/A zephyrproject-rtos/zephyr-lang-rust@7af3db4 (v4.0-branch) N/A

Note: This message is automatically posted and updated by the Manifest GitHub Action.

anangl and others added 28 commits January 15, 2025 15:07
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