Skip to content

Conversation

@nordicjm
Copy link
Contributor

Adds a partition manager configuration to allow building this sample for nrf54l15pdk

rlubos and others added 30 commits May 25, 2024 10:02
…n call"

This reverts commit 8e66a57.

Signed-off-by: Robert Lubos <[email protected]>
…in suspend"

This reverts commit 6e61c5e.

Signed-off-by: Robert Lubos <[email protected]>
…d nrf54h20"

This reverts commit 09df3e0.

Signed-off-by: Robert Lubos <[email protected]>
…futil."

This reverts commit ddca511.

Signed-off-by: Robert Lubos <[email protected]>
This reverts commit d152f62.

Signed-off-by: Robert Lubos <[email protected]>
…um version"

This reverts commit 22df05a.

Signed-off-by: Robert Lubos <[email protected]>
…ER_XXX"

This reverts commit ecb16c7.

Signed-off-by: Robert Lubos <[email protected]>
This reverts commit e6f8064.

Signed-off-by: Robert Lubos <[email protected]>
… network core"

This reverts commit d931964.

Signed-off-by: Robert Lubos <[email protected]>
… test_plan.py script"

This reverts commit 38b93c8.

Signed-off-by: Robert Lubos <[email protected]>
Regular upmerge.

Signed-off-by: Robert Lubos <[email protected]>
…an.py script

In twister, applying quarantine is a part of apply_filters() function.
However, this function is not called when --load-test is used.
Therefore, if one wants to use quarantines in combination with
dynamic scope from the test_plan.py script, one has to pass such
info through the script.

Signed-off-by: Maciej Perkowski <[email protected]>
(cherry picked from commit 48665f2)
Signed-off-by: Robert Lubos <[email protected]>
Add all of the PSA specification defined algorithms and key types.
This makes the configurations independent of what is supported by the
specific implementation.
Add configurations for internal logic to see if a feature is enabled by
PSA_WANTS_XXX.

ref: NCSDK-11689
ref: NCSDK-17840
ref: NCSDK-17840
ref: NCSDK-26057

Add PSA symbols for Oberon extension to the PSA specification.
Mbed TLS has adopted the same naming, so while this is not part of the
PSA specification it is fine to add it to the generic configuration
for both implementations.

Add config support for PBKDF2_HMAC.
Add config support for PBKDF2_AES_CMAC_PRF_128

Signed-off-by: Frank Audun Kvamtrø <[email protected]>
Signed-off-by: Vidar Lillebø <[email protected]>
Signed-off-by: Sebastian Bøe <[email protected]>
Signed-off-by: Markus Swarowsky <[email protected]>
Signed-off-by: Joakim Andersson <[email protected]>
Signed-off-by: Maciej Baczmanski <[email protected]>
Signed-off-by: Georgios Vasilakis <[email protected]>
Signed-off-by: Robert Lubos <[email protected]>
(cherry picked from commit 0a78b66)
(cherry picked from commit b850ab7)
(cherry picked from commit 33121ff)
(cherry picked from commit 1fab667)
(cherry picked from commit 0708dc8)
(cherry picked from commit 93ad09a)
(cherry picked from commit d284b18)
(cherry picked from commit 746b326)
(cherry picked from commit 76b0463)
(cherry picked from commit 5579010)
Add some socket options and address family extensions to Zephyr
headers, which will be useful for nRF Connect SDK.

Add secure socket options:
* Add CID socket options to NCS specific options.
* Add TLS/DTLS tls ciphersuite chosen socket option to NCS specific
  options.
* Add TLS/DTLS connection save/load socket options to NCS specific
  options.
* Add TLS/DTLS handshake status socket option to NCS specific options.

* Add SO_KEEPOPEN socket option.
* Add SO_RAI socket option, deprecate the old ones.

The "author" of this commit is a contact person; various people with
s-o-b lines following here have contributed to the maintenance of this
patch.

Signed-off-by: Andreas Moltumyr <[email protected]>
Signed-off-by: Andrzej Głąbek <[email protected]>
Signed-off-by: Christopher Métrailler <[email protected]>
Signed-off-by: Emanuele Di Santo <[email protected]>
Signed-off-by: Glenn Ruben Bakke <[email protected]>
Signed-off-by: Håkon Alseth <[email protected]>
Signed-off-by: Ioannis Glaropoulos <[email protected]>
Signed-off-by: Jan Tore Guggedal <[email protected]>
Signed-off-by: Joakim Andersson <[email protected]>
Signed-off-by: Martí Bolívar <[email protected]>
Signed-off-by: Mirko Covizzi <[email protected]>
Signed-off-by: Petri Honkala <[email protected]>
Signed-off-by: Robert Lubos <[email protected]>
Signed-off-by: Tommi Mammela <[email protected]>
Signed-off-by: Trond Einar Snekvik <[email protected]>
Signed-off-by: Torsten Rasmussen <[email protected]>
Signed-off-by: Eivind Jølsgard <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit 3a641f9)
(cherry picked from commit 22f7690)
(cherry picked from commit e6f8064)
Require the presence of the nrf-regtool package as well as requiring
a minimum version, failing the build whenever a suitable version is not
found in the system.

Upstream PR: zephyrproject-rtos/zephyr#69633

Signed-off-by: Carles Cufi <[email protected]>
Signed-off-by: Robert Lubos <[email protected]>
(cherry picked from commit 0e13f61d8ed687a2cc428c8a0458f496e639bd70)
(cherry picked from commit 8d93a16)
(cherry picked from commit 3eb95e7)
(cherry picked from commit 22df05a)
This is a long-term noup patch because crypto driver support is
NCS-only for both cryptocell and CRACEN.

Set HAS_HW_NRF_CC3XX to be defined in NS build when cryptocell
is accessed through the PSA API.
We need to know which CC3XX features are available.

Set PSA as the entropy source for 54L.

PSA is the only NCS-supported interface to CRACEN.

Signed-off-by: Georgios Vasilakis <[email protected]>
Signed-off-by: Joakim Andersson <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
Signed-off-by: Sebastian Bøe <[email protected]>
Signed-off-by: Robert Lubos <[email protected]>
(cherry picked from commit 499041d)
(cherry picked from commit baa4ee7)
(cherry picked from commit 4fa3cc9)
(cherry picked from commit 2aba137)
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)
(cherry picked from commit 91b6032)
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]>
Signed-off-by: Robert Lubos <[email protected]>
(cherry picked from commit c976657)
(cherry picked from commit e2b6a2d)
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]>
Signed-off-by: Robert Lubos <[email protected]>
(cherry picked from commit c8cc663)
Upstream PR: zephyrproject-rtos/zephyr#71609

Add devicetree nodes for the Reset Information registers on nRF54H20,
along with a new binding.

Signed-off-by: Grzegorz Swiderski <[email protected]>
Signed-off-by: Robert Lubos <[email protected]>
(cherry picked from commit 8fe636b4d583b7f3d119d7e80094e3b5bfa52099)
(cherry picked from commit a72f221)
alxelax and others added 12 commits June 24, 2024 16:27
…rver

Commit add extension of configuration server by large
composition data server.
Mesh Protocol v1.1 specification
4.4.21.1
The Large Composition Data Server is a main model
that extends the Configuration Server model.

Signed-off-by: Aleksandr Khromykh <[email protected]>
(cherry picked from commit f9d7385)
Turn off suspending MRAM for NRF54H20 DK
This change is required so sections of code
depending on critical timings will not have unacceptable latency.

Signed-off-by: Jan Zyczkowski <[email protected]>
To match used loopbacks.

Signed-off-by: Piotr Kosycarz <[email protected]>
(cherry picked from commit 456fed3)
At least for nrf boards, the emulation timer settings generate
reading around -60 degrees. Verify that value with some threshold.

Delay the first reading to prevent 0 at the beginning.

Signed-off-by: Piotr Kosycarz <[email protected]>
(cherry picked from commit 6898f93)
…ted by cpuppr

Extend Twister configuration for nrf54h20dk/nrf54h20/cpuppr.
Add counter and i2c to the list of supported peripherals.

Signed-off-by: Sebastian Głąb <[email protected]>
(cherry picked from commit b99cf9f)
nrf-squash! [nrf noup] boards: nordic: Turn off MRAM suspend for NRF54H20 DK
Turn on NRFS globally so turning off
suspending MRAM for NRF54H20 DK will work.

Signed-off-by: Jan Zyczkowski <[email protected]>
nrf-squash! [nrf noup] boards: nordic: Turn on NRFS globally

Signed-off-by: Jan Zyczkowski <[email protected]>
Don't attempt to lock the scheduler is trying to dump coverage
information from an ISR. The scheduler won't run while the ISR is in
progress.

Signed-off-by: Jordan Yates <[email protected]>
(cherry picked from commit e881445)
Incremental builds for TF-M are not picked up by Zephyr linking stage.
Code changes to tf-m repository results in a rebuild of TF-M and thus
an updated tfm_s.hex (and other files).

tfm_s.hex is merged together with the zephyr hex to form a final merged
hex file for flashing. This is done as a post-build command, however
such as step cannot take extra dependencies. The Zephyr target can have
extra dependencies, however that will only ensure the dependency is
brought up-to-date when Zephyr re-link, not re-linking Zephyr when the
dependency changes.

Therefore an object dependency is placed on the interface.c file for
Zephyr TF-M interface implementation, which ensures the tfm_api library
is brought up-to-date whenever TF-M rebuilds, and this update again
ensures the Zephyr itself is re-linked whenever TF-M rebuilds.

Upstream PR: zephyrproject-rtos/zephyr#75090

Signed-off-by: Torsten Rasmussen <[email protected]>
Change NRFS logs to debug level not to break tests.

Jira: NCSDK-28199

Upstream PR: zephyrproject-rtos/zephyr#75104

Signed-off-by: Jan Zyczkowski <[email protected]>
nrf-squash! [nrf noup] scripts: west: build: Use sysbuild by default if in NCS dir

Adds the ANT project to the list of repos that should be built
using sysbuild by default

Signed-off-by: Jamie McCrae <[email protected]>
Adds a partition manager configuration to allow building this
sample for nrf54l15pdk

Signed-off-by: Jamie McCrae <[email protected]>
@nvlsianpu
Copy link
Contributor

rebase?

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.