Upmerge 25-03-2024 #1588
Merged
Upmerge 25-03-2024 #1588
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
gmarull
requested review from
koffes,
alexsven,
erikrobstad,
rick1082,
gWacey,
ioannisg,
stephanosio,
carlescufi and
lemrey
as code owners
NordicBuilder
added
manifest
manifest-nrf_hw_models
manifest-hal_xtensa
manifest-mcuboot
manifest-hal_silabs
manifest-babblesim_ext_2G4_libPhyComv1
manifest-openthread
manifest-bsim
manifest-babblesim_ext_2G4_modem_magic
manifest-hal_renesas
manifest-loramac-node
manifest-hal_atmel
manifest-percepio
manifest-hal_espressif
manifest-babblesim_base
manifest-hal_infineon
manifest-babblesim_ext_2G4_modem_BLE_simple
manifest-hal_microchip
manifest-zscilib
manifest-hal_ethos_u
labels
This commit adds an extra parameter in the configuration structure to configure native TLS support at runtime. Signed-off-by: Mirko Covizzi <[email protected]> (cherry picked from commit 63940d9)
TF-M will uses SPU alignment during build time to make sure all partitions can be locked down with the SPU. So adding them for nRF53 Signed-off-by: Markus Swarowsky <[email protected]> Signed-off-by: Dominik Ermel <[email protected]> (cherry picked from commit 9082658)
TF-M will uses SPU alignment during build time to make sure all partitions can be locked down with the SPU. So adding them for nRF91 Signed-off-by: Markus Swarowsky <[email protected]> Signed-off-by: Dominik Ermel <[email protected]> (cherry picked from commit 83be41d)
Change introduces common static Partition Manager configuration. The tfm_nonsecure partition must be SPU region aligned. Ref: NCSDK-18033 Ref: NCSDK-19515 Signed-off-by: Marek Pieta <[email protected]> Signed-off-by: Markus Swarowsky <[email protected]> (cherry picked from commit cb04671)
Enabling USB CDC by default in Thingy:53 board configuration caused that there were two instances of USB CDC in MCUBoot. Change disables one instance which was added automatically by NCS if MCUBoot bootloader was built as a child image. Jira: NCSDK-18596 Signed-off-by: Mateusz Kapala <[email protected]> Signed-off-by: Johann Fischer <[email protected]> (cherry picked from commit 778b2a9) (cherry picked from commit 6799c02)
Change enables MCUboot bootloader by default to allow programming samples and applications without external programmer (using MCUboot serial recovery). Change also enables network core to prevent build failures when building MCUboot with nRF53 multi image DFU. Jira: NCSDK-18263 Signed-off-by: Marek Pieta <[email protected]> Signed-off-by: Vinayak Kariappa Chettimada <[email protected]> Signed-off-by: Johann Fischer <[email protected]> Signed-off-by: Joakim Andersson <[email protected]> (cherry picked from commit ff85910)
This patch backports the nrf9131ek to a time before tfm was refactored. To be reverted when TF-M is updated. Signed-off-by: Maximilian Deubel <[email protected]> Signed-off-by: Dominik Ermel <[email protected]> (cherry picked from commit d0b22f5)
gmarull
force-pushed
the
upmerge-25032024
branch
from
f32566a to
362ade3
Compare
|
Please pullin jtguggedal@cced921 to fix spi_nor driver issues that affects external flash on several boards |
Please, open a PR in sdk-zephyr upmerge branch and justify why a noup and not upstream. |
gmarull
force-pushed
the
upmerge-25032024
branch
2 times, most recently
from
9c33336 to
0adda28
Compare
Partition Manager (PM) is a component of the nRF Connect SDK (NCS) which uses yaml files to resolve flash partition placement with a holistic view of the entire device, including each firmware image present on the flash device, and various subsystems, such as settings and NFFS. When this NCS extension is used, various source files which would use partition information from devicetree in "vanilla" zephyr instead use defines generated by PM instead. This commit removes support for HEX_FILES_TO_MERGE, as it conflicts with PM. The settings subsystem pm.yml defines a partition 'settings_storage'. The nffs subsystem pm.yml defines 'nffs_storage'. Leverage label translation to avoid patching partition names. Refer to the NCS documentation page for this feature for more details. This is a long-running out of tree patch which has been worked on by several people. The following sign-offs are in alphabetical order by first name. Signed-off-by: Andrzej Głąbek <[email protected]> Signed-off-by: Andrzej Puzdrowski <[email protected]> Signed-off-by: Håkon Øye Amundsen <[email protected]> Signed-off-by: Ioannis Glaropoulos <[email protected]> Signed-off-by: Joakim Andersson <[email protected]> Signed-off-by: Johann Fischer <[email protected]> Signed-off-by: Martí Bolívar <[email protected]> Signed-off-by: Ole Sæther <[email protected]> Signed-off-by: Robert Lubos <[email protected]> Signed-off-by: Sebastian Bøe <[email protected]> Signed-off-by: Sigvart Hovland <[email protected]> Signed-off-by: Thomas Stenersen <[email protected]> Signed-off-by: Torsten Rasmussen <[email protected]> Signed-off-by: Øyvind Rønningstad <[email protected]> Signed-off-by: Trond Einar Snekvik <[email protected]> Signed-off-by: Gerard Marull-Paretas <[email protected]> Signed-off-by: Tomasz Moń <[email protected]> Signed-off-by: Dominik Ermel <[email protected]> (cherry picked from commit a7fb268) (cherry picked from commit ea83f6c)
Configuration allows DFU with serial transport using mcumgr and over BT using nRF Connect. Signed-off-by: Mateusz Michalek <[email protected]>
This adds temporary entropy driver simulation for nRF54h20 device since final entropy source is not available yet. TODO: Remove this commit when proper solution will be available. Jira: NCSDK-25947 Signed-off-by: Kamil Gawor <[email protected]> (cherry picked from commit c976657)
All changes in nrf54 boards will trigger low-level testing. Signed-off-by: Piotr Kosycarz <[email protected]> (cherry picked from commit 3c68e19)
This commit adds the nRF54l15//nrf54l15/cpuapp/ns board variant to sdk-zephyr. It allows to build nRF54l15pdk with TF-M in nRF Connect SDK. This is done as a nrf noup patch as the out-of-tree board extension feature is not available. When zephyrproject-rtos/zephyr#69548 is completed, then this commit can be reverted and the variant be placed in sdk-nrf repository. Signed-off-by: Torsten Rasmussen <[email protected]>
Define RTS and CTS pins. This commit can be dropped when those upstream changes will be included: zephyrproject-rtos/zephyr#70892 zephyrproject-rtos/zephyr#71605 Signed-off-by: Piotr Kosycarz <[email protected]> (cherry picked from commit c22c9c2)
Added description of sample testcase for building smp_svr with support of secondary partition in on PDK spi_nor flash. Signed-off-by: Andrzej Puzdrowski <[email protected]> (cherry picked from commit 849d51f)
We have our own psa crypto samples to show how to used PSA crypto with NCS. This sample still uses CONFIG_MBEDTLS_BUILTIN which is not supported anymore, therefore removing the support for it in NCS. Ref: NCSDK-17944 Signed-off-by: Markus Swarowsky <[email protected]>
Added DTS of PDK's mx25r64 flash memory. Memory is described under spi00 peripheral and can be controlled used flash spi_nor driver. To be reverted once upstream PR can be applied cleanly zephyrproject-rtos/zephyr#71425 Signed-off-by: Andrzej Puzdrowski <[email protected]>
Sets up default for builds with partition manager. Signed-off-by: Mateusz Michalek <[email protected]> Signed-off-by: Grzegorz Chwierut <[email protected]>
Simple enabling adc node. Upstream PR: zephyrproject-rtos/zephyr#68692 Applied as noup because it can't be applied cleanly. Signed-off-by: Karol Lasończyk <[email protected]> (cherry picked from commit 88adda3b14f726645c0a3ebac6d6fab571144f11)
Adds support for first possible LED to be connected with HW PWM. Upstream PR: zephyrproject-rtos/zephyr#72010 Merged as noup because of conflicts. Signed-off-by: Karol Lasończyk <[email protected]> (cherry picked from commit 382a1ee791e3637b5b7d25f22905017c24997438)
There was unneeded check for enter_4byte_addr_exist, that would be set by existence of enter-4byte-addr property, as the function is generic DTS/SFPD implementation and parsed parameter to obtain the information. The check was breaking usage of SFDP as with SFDP the parameter may never be provided. The commit removes the check and the enter_4byte_addr_exist, as it does not seem needed for anything. The incorrectly placed conditional compilation for DPD exit sequence has broken DPD exit in case where such sequence is not needed. Signed-off-by: Dominik Ermel <[email protected]> Signed-off-by: Jan Tore Guggedal <[email protected]>
gmarull
force-pushed
the
upmerge-25032024
branch
from
0adda28 to
34de084
Compare
|
Verified that the failing checks are not related to downstream changes. |
I believe we already had it disabled for a while and I think it's a second time when it auto-enabled itself during upmerge . |
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.
No description provided.