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 25-03-2024 #1588

Merged
merged 2,403 commits into from
Apr 30, 2024
Merged

Upmerge 25-03-2024 #1588

merged 2,403 commits into from
Apr 30, 2024

Conversation

gmarull
Copy link
Member

@gmarull gmarull commented Mar 25, 2024

No description provided.

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Mar 25, 2024

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

Name Old Revision New Revision Diff
babblesim_base BabbleSim/base@19d6242 BabbleSim/base@4bd907b BabbleSim/base@19d62424..4bd907be
babblesim_ext_2G4_device_playback BabbleSim/ext_2G4_device_playback@85c6459 BabbleSim/ext_2G4_device_playback@abb48cd (master) BabbleSim/ext_2G4_device_playback@85c64592..abb48cd7
babblesim_ext_2G4_libPhyComv1 BabbleSim/ext_2G4_libPhyComv1@9018113 BabbleSim/ext_2G4_libPhyComv1@93f5eba BabbleSim/ext_2G4_libPhyComv1@9018113a..93f5eba5
babblesim_ext_2G4_modem_BLE_simple BabbleSim/ext_2G4_modem_BLE_simple@809ab07 BabbleSim/ext_2G4_modem_BLE_simple@a38d2d2 BabbleSim/ext_2G4_modem_BLE_simple@809ab073..a38d2d24
babblesim_ext_2G4_modem_magic BabbleSim/ext_2G4_modem_magic@cb70771 BabbleSim/ext_2G4_modem_magic@edfcda2 (master) BabbleSim/ext_2G4_modem_magic@cb707717..edfcda2d
babblesim_ext_2G4_phy_v1 BabbleSim/ext_2G4_phy_v1@d47c6dd BabbleSim/ext_2G4_phy_v1@1ab9a88 BabbleSim/ext_2G4_phy_v1@d47c6dd9..1ab9a884
bsim zephyrproject-rtos/babblesim-manifest@384a091 (v2.1.1) zephyrproject-rtos/babblesim-manifest@68f6282 (v2.2) zephyrproject-rtos/babblesim-manifest@384a0914..68f6282c
hal_atmel zephyrproject-rtos/hal_atmel@aad79bf zephyrproject-rtos/hal_atmel@d6221e7 (master) zephyrproject-rtos/hal_atmel@aad79bf5..d6221e73
hal_espressif zephyrproject-rtos/hal_espressif@67fa60b zephyrproject-rtos/hal_espressif@dddb7cf (zephyr) zephyrproject-rtos/hal_espressif@67fa60bd..dddb7cf3
hal_ethos_u zephyrproject-rtos/hal_ethos_u@90ada2e zephyrproject-rtos/hal_ethos_u@8e2cf75 (main) zephyrproject-rtos/hal_ethos_u@90ada2ea..8e2cf756
hal_infineon zephyrproject-rtos/hal_infineon@69c883d zephyrproject-rtos/hal_infineon@b1a4723 (master) zephyrproject-rtos/hal_infineon@69c883d3..b1a47231
hal_microchip zephyrproject-rtos/hal_microchip@5d079f1 zephyrproject-rtos/hal_microchip@68575aa (master) zephyrproject-rtos/hal_microchip@5d079f16..68575aa2
hal_nuvoton zephyrproject-rtos/hal_nuvoton@68a91bb zephyrproject-rtos/hal_nuvoton@34efb92 zephyrproject-rtos/hal_nuvoton@68a91bb3..34efb92e
hal_nxp zephyrproject-rtos/hal_nxp@d45b14c zephyrproject-rtos/hal_nxp@4ab0e7b zephyrproject-rtos/hal_nxp@d45b14c1..4ab0e7bc
hal_renesas zephyrproject-rtos/hal_renesas@0b1f2fd zephyrproject-rtos/hal_renesas@991e060 zephyrproject-rtos/hal_renesas@0b1f2fdb..991e060b
hal_silabs zephyrproject-rtos/hal_silabs@b11b291 zephyrproject-rtos/hal_silabs@442d0fb zephyrproject-rtos/hal_silabs@b11b2916..442d0fb1
hal_st zephyrproject-rtos/hal_st@0643d20 zephyrproject-rtos/hal_st@b77157f (master) zephyrproject-rtos/hal_st@0643d20a..b77157f6
hal_xtensa zephyrproject-rtos/hal_xtensa@08325d6 zephyrproject-rtos/hal_xtensa@a2d6585 (master) zephyrproject-rtos/hal_xtensa@08325d6f..a2d65852
hostap zephyrproject-rtos/hostap@dee924c zephyrproject-rtos/hostap@81bdd83 zephyrproject-rtos/hostap@dee924ca..81bdd834
loramac-node zephyrproject-rtos/loramac-node@842413c zephyrproject-rtos/loramac-node@1bf2120 zephyrproject-rtos/loramac-node@842413c5..1bf2120c
lvgl zephyrproject-rtos/lvgl@2b76c64 zephyrproject-rtos/lvgl@2b498e6 (zephyr) zephyrproject-rtos/lvgl@2b76c641..2b498e6f
mcuboot zephyrproject-rtos/mcuboot@a4eda30 zephyrproject-rtos/mcuboot@24ac8cc zephyrproject-rtos/mcuboot@a4eda30f..24ac8cc2
net-tools zephyrproject-rtos/net-tools@3a677d3 zephyrproject-rtos/net-tools@cd2eb18 zephyrproject-rtos/net-tools@3a677d35..cd2eb185
nrf_hw_models zephyrproject-rtos/nrf_hw_models@319e3eb zephyrproject-rtos/nrf_hw_models@df94612 zephyrproject-rtos/nrf_hw_models@319e3ebd..df94612a
openthread zephyrproject-rtos/openthread@7761b81 zephyrproject-rtos/openthread@49c59ec (main) zephyrproject-rtos/openthread@7761b81d..49c59ec5
percepio zephyrproject-rtos/percepio@0fbc5b7 zephyrproject-rtos/percepio@7f6fb3f (zephyr) zephyrproject-rtos/percepio@0fbc5b72..7f6fb3f1
sof zephyrproject-rtos/sof@0606152 zephyrproject-rtos/sof@c11a318 (zephyr) zephyrproject-rtos/sof@0606152d..c11a3185
zcbor zephyrproject-rtos/zcbor@d3093b5 (main) zephyrproject-rtos/zcbor@75d0880 (release/0.8.2) zephyrproject-rtos/zcbor@d3093b56..75d08803
zscilib zephyrproject-rtos/zscilib@a4bb6cf zephyrproject-rtos/zscilib@ee1b287 (master) zephyrproject-rtos/zscilib@a4bb6cfd..ee1b287d

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

MirkoCovizzi and others added 7 commits April 30, 2024 11:04
This commit adds an extra parameter in the configuration
structure to configure native TLS support at runtime.

Signed-off-by: Mirko Covizzi <mirko.covizzi@nordicsemi.no>
(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 <markus.swarowsky@nordicsemi.no>
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
(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 <markus.swarowsky@nordicsemi.no>
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
(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 <Marek.Pieta@nordicsemi.no>
Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
(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 <mateusz.kapala@nordicsemi.no>
Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
(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 <Marek.Pieta@nordicsemi.no>
Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
(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 <maximilian.deubel@nordicsemi.no>
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
(cherry picked from commit d0b22f5)
@jtguggedal
Copy link
Contributor

Please pullin jtguggedal@cced921 to fix spi_nor driver issues that affects external flash on several boards

@gmarull
Copy link
Member Author

gmarull commented Apr 30, 2024

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 gmarull force-pushed the upmerge-25032024 branch 2 times, most recently from 9c33336 to 0adda28 Compare April 30, 2024 14:16
sigvartmh and others added 13 commits April 30, 2024 16:26
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 <andrzej.glabek@nordicsemi.no>
Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
Signed-off-by: Håkon Øye Amundsen <haakon.amundsen@nordicsemi.no>
Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
Signed-off-by: Ole Sæther <ole.saether@nordicsemi.no>
Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
Signed-off-by: Sigvart Hovland <sigvart.hovland@nordicsemi.no>
Signed-off-by: Thomas Stenersen <thomas.stenersen@nordicsemi.no>
Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Signed-off-by: Øyvind Rønningstad <oyvind.ronningstad@nordicsemi.no>
Signed-off-by: Trond Einar Snekvik <Trond.Einar.Snekvik@nordicsemi.no>
Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
(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 <mateusz.michalek@nordicsemi.no>
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 <Kamil.Gawor@nordicsemi.no>
(cherry picked from commit c976657)
All changes in nrf54 boards will trigger low-level testing.

Signed-off-by: Piotr Kosycarz <piotr.kosycarz@nordicsemi.no>
(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 <Torsten.Rasmussen@nordicsemi.no>
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 <piotr.kosycarz@nordicsemi.no>
(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 <andrzej.puzdrowski@nordicsemi.no>
(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 <markus.swarowsky@nordicsemi.no>
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 <andrzej.puzdrowski@nordicsemi.no>
Sets up default for builds with partition manager.

Signed-off-by: Mateusz Michalek <mateusz.michalek@nordicsemi.no>
Signed-off-by: Grzegorz Chwierut <grzegorz.chwierut@nordicsemi.no>
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 <karol.lasonczyk@nordicsemi.no>
(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 <karol.lasonczyk@nordicsemi.no>
(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 <dominik.ermel@nordicsemi.no>
Signed-off-by: Jan Tore Guggedal <jantore.guggedal@nordicsemi.no>
@carlescufi
Copy link
Contributor

carlescufi commented Apr 30, 2024

Verified that the failing checks are not related to downstream changes.
Had to disable the clang check due to new incompatibilities @PerMac.

@gmarull gmarull merged commit 34de084 into nrfconnect:main Apr 30, 2024
68 of 71 checks passed
@gmarull gmarull deleted the upmerge-25032024 branch April 30, 2024 15:01
@PerMac
Copy link
Contributor

PerMac commented May 1, 2024

Verified that the failing checks are not related to downstream changes.
Had to disable the clang check due to new incompatibilities @PerMac.

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.